about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-03-31 10:40:02 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-04-17 16:12:41 -0300
commit250a53976c41fd52dabf56044ec4721b8ec331a5 (patch)
treed69a0c8606d2dfc15104038dfd94d70a6b3d8c03
parent0f38a02254077d5bd42c3f88ccaef10e733a76e2 (diff)
downloadglibc-250a53976c41fd52dabf56044ec4721b8ec331a5.tar.gz
glibc-250a53976c41fd52dabf56044ec4721b8ec331a5.tar.xz
glibc-250a53976c41fd52dabf56044ec4721b8ec331a5.zip
x86: Use bool for C++ on x86.h
Not all compilers might define C99 _Bool type on C++ mode in old
standard modes (clang does not define for -std=c++98).
-rw-r--r--misc/sys/cdefs.h7
-rw-r--r--sysdeps/unix/sysv/linux/x86/bits/platform/features.h2
-rw-r--r--sysdeps/x86/sys/platform/x86.h4
3 files changed, 10 insertions, 3 deletions
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index d1f411a57a..e8cf1d891f 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -881,4 +881,11 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf
 # define __attribute_noclone__ /* Ignore.  */
 #endif
 
+/* Not all compiles support _Bool type in C++.  */
+#ifdef	__cplusplus
+# define __BOOLEAN bool
+#else
+# define __BOOLEAN _Bool
+#endif
+
 #endif	 /* sys/cdefs.h */
diff --git a/sysdeps/unix/sysv/linux/x86/bits/platform/features.h b/sysdeps/unix/sysv/linux/x86/bits/platform/features.h
index 7704febe92..0405ac51d9 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/platform/features.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/platform/features.h
@@ -28,7 +28,7 @@ enum
   x86_feature_1_shstk		= 1U << 1
 };
 
-static __inline__ _Bool
+static __inline__ __BOOLEAN
 x86_cpu_cet_active (unsigned int __index)
 {
 #ifdef __x86_64__
diff --git a/sysdeps/x86/sys/platform/x86.h b/sysdeps/x86/sys/platform/x86.h
index b8066ccc9f..8fc54b9b5c 100644
--- a/sysdeps/x86/sys/platform/x86.h
+++ b/sysdeps/x86/sys/platform/x86.h
@@ -30,7 +30,7 @@ __BEGIN_DECLS
 extern const struct cpuid_feature *__x86_get_cpuid_feature_leaf (unsigned int)
      __attribute__ ((pure));
 
-static __inline__ _Bool
+static __inline__ __BOOLEAN
 x86_cpu_present (unsigned int __index)
 {
   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);
 }
 
-static __inline__ _Bool
+static __inline__ __BOOLEAN
 x86_cpu_active (unsigned int __index)
 {
   if (__index == x86_cpu_IBT || __index == x86_cpu_SHSTK)