diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-kernel/sysprof/files/wordsize.patch | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-kernel/sysprof/files/wordsize.patch')
| -rw-r--r-- | poky/meta/recipes-kernel/sysprof/files/wordsize.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/poky/meta/recipes-kernel/sysprof/files/wordsize.patch b/poky/meta/recipes-kernel/sysprof/files/wordsize.patch deleted file mode 100644 index d65b13a68..000000000 --- a/poky/meta/recipes-kernel/sysprof/files/wordsize.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/merge_requests/5] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From bc7e3e27c28d0bab8bea72f2314191532b2e7840 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Fri, 7 Sep 2018 01:30:09 +0100 -Subject: [PATCH] capture: use size of void* instead of glibc-specific - __WORDSIZE - -__WORDSIZE is glibc-specific so sp-capture-types.h doesn't work with musl. ---- - lib/capture/sp-capture-types.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/lib/capture/sp-capture-types.h b/lib/capture/sp-capture-types.h -index 48fcfb8..1d6cd1d 100644 ---- a/lib/capture/sp-capture-types.h -+++ b/lib/capture/sp-capture-types.h -@@ -32,12 +32,14 @@ G_BEGIN_DECLS - #define SP_CAPTURE_MAGIC (GUINT32_TO_LE(0xFDCA975E)) - #define SP_CAPTURE_ALIGN (sizeof(SpCaptureAddress)) - --#if __WORDSIZE == 64 -+#if GLIB_SIZEOF_VOID_P == 8 - # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE000000000000000) - # define SP_CAPTURE_ADDRESS_FORMAT "0x%016lx" --#else -+#elif GLIB_SIZEOF_VOID_P == 4 - # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE0000000) - # define SP_CAPTURE_ADDRESS_FORMAT "0x%016llx" -+#else -+#error Unknown GLIB_SIZEOF_VOID_P - #endif - - #define SP_CAPTURE_CURRENT_TIME (sp_clock_get_current_time()) --- -2.11.0 - |