| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/merge_requests/5] |
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 3 | |
| 4 | From bc7e3e27c28d0bab8bea72f2314191532b2e7840 Mon Sep 17 00:00:00 2001 |
| 5 | From: Ross Burton <ross.burton@intel.com> |
| 6 | Date: Fri, 7 Sep 2018 01:30:09 +0100 |
| 7 | Subject: [PATCH] capture: use size of void* instead of glibc-specific |
| 8 | __WORDSIZE |
| 9 | |
| 10 | __WORDSIZE is glibc-specific so sp-capture-types.h doesn't work with musl. |
| 11 | --- |
| 12 | lib/capture/sp-capture-types.h | 6 ++++-- |
| 13 | 1 file changed, 4 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/lib/capture/sp-capture-types.h b/lib/capture/sp-capture-types.h |
| 16 | index 48fcfb8..1d6cd1d 100644 |
| 17 | --- a/lib/capture/sp-capture-types.h |
| 18 | +++ b/lib/capture/sp-capture-types.h |
| 19 | @@ -32,12 +32,14 @@ G_BEGIN_DECLS |
| 20 | #define SP_CAPTURE_MAGIC (GUINT32_TO_LE(0xFDCA975E)) |
| 21 | #define SP_CAPTURE_ALIGN (sizeof(SpCaptureAddress)) |
| 22 | |
| 23 | -#if __WORDSIZE == 64 |
| 24 | +#if GLIB_SIZEOF_VOID_P == 8 |
| 25 | # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE000000000000000) |
| 26 | # define SP_CAPTURE_ADDRESS_FORMAT "0x%016lx" |
| 27 | -#else |
| 28 | +#elif GLIB_SIZEOF_VOID_P == 4 |
| 29 | # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE0000000) |
| 30 | # define SP_CAPTURE_ADDRESS_FORMAT "0x%016llx" |
| 31 | +#else |
| 32 | +#error Unknown GLIB_SIZEOF_VOID_P |
| 33 | #endif |
| 34 | |
| 35 | #define SP_CAPTURE_CURRENT_TIME (sp_clock_get_current_time()) |
| 36 | -- |
| 37 | 2.11.0 |
| 38 | |