| Andrew Geissler | c723b72 | 2021-01-08 16:14:09 -0600 | [diff] [blame] | 1 | From 9d0dc8aedd08d77797f90fa6075a59613f18bf0d Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 20 Dec 2020 07:56:07 -0800 |
| 4 | Subject: [PATCH] meson: Check for __get_cpuid |
| 5 | |
| 6 | checking for presence of cpuid.h header alone is not sufficient in some case to use |
| 7 | cpuid related functions. e.g. when using clang which is built for |
| 8 | multiple targets will have cpuid.h header as part of compiler headers in |
| 9 | distribution but one maybe compiling pulseaudion for non-x86 target. The |
| 10 | current check in meson succeeds and then compile fails later because |
| 11 | cpuid.h is x86-specific header. Therefore checking for symbol that is |
| 12 | needed makes this robust, so even if header exist it will try to ensure |
| 13 | the given symbol can be used |
| 14 | |
| 15 | Fixes |
| 16 | src/pulsecore/core-util.c:113: |
| 17 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/pulseaudio/14.0-r0/recipe-sysroot-native/usr/lib/clang/11.0.1/include/cpuid.h:11:2: error: this header is for x86 only |
| 18 | | #error this header is for x86 only |
| 19 | | ^ |
| 20 | |
| 21 | Upstream-Status: Pending |
| 22 | |
| 23 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 24 | Cc: Tanu Kaskinen <tanuk@iki.fi> |
| 25 | --- |
| 26 | meson.build | 5 ++++- |
| 27 | src/pulsecore/core-util.c | 2 +- |
| 28 | src/pulsecore/cpu-x86.c | 2 +- |
| 29 | 3 files changed, 6 insertions(+), 3 deletions(-) |
| 30 | |
| 31 | diff --git a/meson.build b/meson.build |
| 32 | index 2589627..5f5127e 100644 |
| 33 | --- a/meson.build |
| 34 | +++ b/meson.build |
| 35 | @@ -185,7 +185,6 @@ endif |
| 36 | check_headers = [ |
| 37 | 'arpa/inet.h', |
| 38 | 'byteswap.h', |
| 39 | - 'cpuid.h', |
| 40 | 'dlfcn.h', |
| 41 | 'execinfo.h', |
| 42 | 'grp.h', |
| 43 | @@ -243,6 +242,10 @@ if cc.has_header_symbol('pthread.h', 'PTHREAD_PRIO_INHERIT') |
| 44 | cdata.set('HAVE_PTHREAD_PRIO_INHERIT', 1) |
| 45 | endif |
| 46 | |
| 47 | +if cc.has_header_symbol('cpuid.h', '__get_cpuid') |
| 48 | + cdata.set('HAVE_GET_CPUID', 1) |
| 49 | +endif |
| 50 | + |
| 51 | # Functions |
| 52 | |
| 53 | check_functions = [ |
| 54 | diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c |
| 55 | index 601b1d1..6f34e7c 100644 |
| 56 | --- a/src/pulsecore/core-util.c |
| 57 | +++ b/src/pulsecore/core-util.c |
| 58 | @@ -109,7 +109,7 @@ |
| 59 | #include <sys/personality.h> |
| 60 | #endif |
| 61 | |
| 62 | -#ifdef HAVE_CPUID_H |
| 63 | +#ifdef HAVE_GET_CPUID |
| 64 | #include <cpuid.h> |
| 65 | #endif |
| 66 | |
| 67 | diff --git a/src/pulsecore/cpu-x86.c b/src/pulsecore/cpu-x86.c |
| 68 | index 4e59e14..86595d4 100644 |
| 69 | --- a/src/pulsecore/cpu-x86.c |
| 70 | +++ b/src/pulsecore/cpu-x86.c |
| 71 | @@ -24,7 +24,7 @@ |
| 72 | |
| 73 | #include <stdint.h> |
| 74 | |
| 75 | -#ifdef HAVE_CPUID_H |
| 76 | +#ifdef HAVE_GET_CPUID |
| 77 | #include <cpuid.h> |
| 78 | #endif |
| 79 | |
| 80 | -- |
| 81 | 2.29.2 |
| 82 | |