From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 2C9A13857B8B; Thu, 21 Dec 2023 18:58:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2C9A13857B8B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1703185120; bh=MZwuWA3IVShqKisgPbjhXAZaEIlO0P5v2oP9l6NbTVI=; h=From:To:Subject:Date:From; b=Vwz1b5M1tvwkp6AiH9WCAAlHXOvRfpRuIk6nyke+cuoBHumq5Na9togI5hJ0CPdpK L6cJSxEwB8ucm6oZ7/HjDGYQYonqLIFxotPXYdoKeXPKZLHXCiie9T5sKye5HiVx6l YTHcOg8vJlYMPc09jAQOFfwv1tHSZk2eDE2j+AXg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] x86: Use bool for C++ on x86.h X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: d29d92099f14c60cde857ae0c69d826f21b56fef X-Git-Newrev: 1016b4784f337912b36077e067f171807c1dd2ca Message-Id: <20231221185840.2C9A13857B8B@sourceware.org> Date: Thu, 21 Dec 2023 18:58:40 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1016b4784f337912b36077e067f171807c1dd2ca commit 1016b4784f337912b36077e067f171807c1dd2ca Author: Adhemerval Zanella Date: Thu Mar 31 10:40:02 2022 -0300 x86: Use bool for C++ on x86.h Not all compilers define C99 _Bool type on C++ mode. Diff: --- misc/sys/cdefs.h | 7 +++++++ sysdeps/x86/sys/platform/x86.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 73912dfa17..ed6889c6a2 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -872,4 +872,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/x86/sys/platform/x86.h b/sysdeps/x86/sys/platform/x86.h index 1ea2c5fc0b..88bced7d8d 100644 --- a/sysdeps/x86/sys/platform/x86.h +++ b/sysdeps/x86/sys/platform/x86.h @@ -29,7 +29,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 @@ -42,7 +42,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) { const struct cpuid_feature *__ptr = __x86_get_cpuid_feature_leaf