niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

sys/platform/x86.h: Do not depend on _Bool definition in C++ mode

Browse source 
Clang does not define _Bool for -std=c++98:

/usr/include/bits/platform/features.h:31:19: error: unknown type name '_Bool'
   31 | static __inline__ _Bool
      |                   ^

Change _Bool to bool to silence clang++ error.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Florian Weimer <fweimer@redhat.com>
This commit is contained in:
H.J. Lu 2024-12-18 02:25:03 +08:00
parent 7d889b99c1
commit a194871b13
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysdeps/unix/sysv/linux/x86/bits/platform/features.h
View file

@ -28,7 +28,7 @@ enum
x86_feature_1_shstk = 1U << 1 x86_feature_1_shstk = 1U << 1
}; };
static __inline__ _Bool static __inline__ bool
x86_cpu_cet_active (unsigned int __index) x86_cpu_cet_active (unsigned int __index)
{ {
#ifdef __x86_64__ #ifdef __x86_64__

2
sysdeps/x86/bits/platform/features.h
View file

@ -20,7 +20,7 @@
# error "Never include <bits/platform/features.h> directly; use <sys/platform/x86.h> instead." # error "Never include <bits/platform/features.h> directly; use <sys/platform/x86.h> instead."
#endif #endif
static __inline__ _Bool static __inline__ bool
x86_cpu_cet_active (unsigned int __index) x86_cpu_cet_active (unsigned int __index)
{ {
return false; return false;

4
sysdeps/x86/sys/platform/x86.h
View file

@ -30,7 +30,7 @@ __BEGIN_DECLS
extern const struct cpuid_feature *__x86_get_cpuid_feature_leaf (unsigned int) extern const struct cpuid_feature *__x86_get_cpuid_feature_leaf (unsigned int)
__attribute__ ((pure)); __attribute__ ((pure));
static __inline__ _Bool static __inline__ bool
x86_cpu_present (unsigned int __index) x86_cpu_present (unsigned int __index)
{ {
const struct cpuid_feature *__ptr = __x86_get_cpuid_feature_leaf const struct cpuid_feature *__ptr = __x86_get_cpuid_feature_leaf
@ -43,7 +43,7 @@ x86_cpu_present (unsigned int __index)
return __ptr->cpuid_array[__reg] & (1 << __bit); return __ptr->cpuid_array[__reg] & (1 << __bit);
} }
static __inline__ _Bool static __inline__ bool
x86_cpu_active (unsigned int __index) x86_cpu_active (unsigned int __index)
{ {
if (__index == x86_cpu_IBT || __index == x86_cpu_SHSTK) if (__index == x86_cpu_IBT || __index == x86_cpu_SHSTK)