From: Joseph Myers <joseph@codesourcery.com>
To: <libc-alpha@sourceware.org>
Subject: Do not define static_assert or thread_local in headers for C2x
Date: Wed, 7 Sep 2022 15:15:26 +0000 [thread overview]
Message-ID: <alpine.DEB.2.22.394.2209071514330.876631@digraph.polyomino.org.uk> (raw)
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 --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
--
Joseph S. Myers
joseph@codesourcery.com
next reply other threads:[~2022-09-07 15:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 15:15 Joseph Myers [this message]
2022-09-07 18:15 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.22.394.2209071514330.876631@digraph.polyomino.org.uk \
--to=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).