From a194871b13d6691d6ede3f62165eaf91064fcfe9 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 18 Dec 2024 02:25:03 +0800 Subject: [PATCH] sys/platform/x86.h: Do not depend on _Bool definition in C++ mode 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 Reviewed-by: Florian Weimer --- sysdeps/unix/sysv/linux/x86/bits/platform/features.h | 2 +- sysdeps/x86/bits/platform/features.h | 2 +- sysdeps/x86/sys/platform/x86.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/x86/bits/platform/features.h b/sysdeps/unix/sysv/linux/x86/bits/platform/features.h index 7704febe92..1e63743e3f 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__ bool x86_cpu_cet_active (unsigned int __index) { #ifdef __x86_64__ diff --git a/sysdeps/x86/bits/platform/features.h b/sysdeps/x86/bits/platform/features.h index f02489266e..676ad0000a 100644 --- a/sysdeps/x86/bits/platform/features.h +++ b/sysdeps/x86/bits/platform/features.h @@ -20,7 +20,7 @@ # error "Never include directly; use instead." #endif -static __inline__ _Bool +static __inline__ bool x86_cpu_cet_active (unsigned int __index) { return false; diff --git a/sysdeps/x86/sys/platform/x86.h b/sysdeps/x86/sys/platform/x86.h index b8066ccc9f..1f5378031c 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__ bool 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__ bool x86_cpu_active (unsigned int __index) { if (__index == x86_cpu_IBT || __index == x86_cpu_SHSTK)