From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 457A33858009; Wed, 7 Feb 2024 14:11:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 457A33858009 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1707315116; bh=olkcApbFCjgjym/ZCs7iDA/c1MyJ323UcL/iy8drKn8=; h=From:To:Subject:Date:From; b=CoXszravEbotcZ9AkREzmDCR4IRG3o7AE0uY9w5LPt0YHhGZyEEs7Z9z2YrLqaJ3O OS1XwlEib9AZLZnw/vhyq9NihsJf9ZAvXLd7ytwp2y20kX2j+fN4HUvPfHMujKfzcs HN1nEiMvFWXhB/CH/xu/T0sh3GX0EJhvgTf4igV0= 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: ac19f1f88896d71a8f7e7760382ec0a22d2d8d2a X-Git-Newrev: 33869181467f7bfb5c93fd34fa0dbd57faede275 Message-Id: <20240207141156.457A33858009@sourceware.org> Date: Wed, 7 Feb 2024 14:11:56 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=33869181467f7bfb5c93fd34fa0dbd57faede275 commit 33869181467f7bfb5c93fd34fa0dbd57faede275 Author: Adhemerval Zanella Date: Thu Mar 31 10:40:02 2022 -0300 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). Diff: --- misc/sys/cdefs.h | 7 +++++++ sysdeps/unix/sysv/linux/x86/bits/platform/features.h | 2 +- sysdeps/x86/sys/platform/x86.h | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 7930f2f5b2..0ed65fc4f6 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)