public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Do not define static_assert or thread_local in headers for C2x
@ 2022-09-07 18:39 Joseph Myers
0 siblings, 0 replies; only message in thread
From: Joseph Myers @ 2022-09-07 18:39 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b8cc607f3c1e8371b89158f427a61f28018604a5
commit b8cc607f3c1e8371b89158f427a61f28018604a5
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed Sep 7 18:39:28 2022 +0000
Do not define static_assert or thread_local in headers for C2x
C2x makes static_assert and thread_local into keywords, removing the
definitions as macros in assert.h and threads.h. Thus, disable those
macros in those glibc headers for C2x.
The disabling is done based on a combination of language version and
__GNUC_PREREQ, *not* based on __GLIBC_USE (ISOC2X), on the principle
that users of the header (when requesting C11 or later APIs - not
assert.h for C99 and older API versions) should always have the names
static_assert or thread_local available after inclusion of the header,
whether as a keyword or as a macro. Thus, when using a compiler
without the keywords (whether an older compiler, possibly in C2x mode,
or _GNU_SOURCE with any compiler but in an older language mode, for
example) the macros should be defined, even when C2x APIs have been
requested. The __GNUC_PREREQ conditionals here may well need updating
with the versions of other compilers that gained support for these
keywords in C2x mode.
Tested for x86_64.
Diff:
---
assert/assert.h | 6 +++++-
sysdeps/pthread/threads.h | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/assert/assert.h b/assert/assert.h
index 67f1cce5e9..b438d8eeb7 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -135,7 +135,11 @@ __END_DECLS
#endif /* NDEBUG. */
-#if defined __USE_ISOC11 && !defined __cplusplus
+#if (defined __USE_ISOC11 \
+ && (!defined __STDC_VERSION__ \
+ || __STDC_VERSION__ <= 201710L \
+ || !__GNUC_PREREQ (13, 0)) \
+ && !defined __cplusplus)
# undef static_assert
# define static_assert _Static_assert
#endif
diff --git a/sysdeps/pthread/threads.h b/sysdeps/pthread/threads.h
index 687b45c610..13c8f35768 100644
--- a/sysdeps/pthread/threads.h
+++ b/sysdeps/pthread/threads.h
@@ -27,7 +27,9 @@ __BEGIN_DECLS
#include <bits/thread-shared-types.h>
#include <bits/types/struct_timespec.h>
-#ifndef __cplusplus
+#if (!defined __STDC_VERSION__ \
+ || __STDC_VERSION__ <= 201710L \
+ || !__GNUC_PREREQ (13, 0)) && !defined __cplusplus
# define thread_local _Thread_local
#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-07 18:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-07 18:39 [glibc] Do not define static_assert or thread_local in headers for C2x Joseph Myers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).