public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-2626] stdatomic.h: Do not define ATOMIC_VAR_INIT for C2x
@ 2022-09-12 14:35 Joseph Myers
0 siblings, 0 replies; only message in thread
From: Joseph Myers @ 2022-09-12 14:35 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:2e7bc76d84f0aa2f08bc01407ffcdca43c15f2ff
commit r13-2626-g2e7bc76d84f0aa2f08bc01407ffcdca43c15f2ff
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Sep 12 14:34:26 2022 +0000
stdatomic.h: Do not define ATOMIC_VAR_INIT for C2x
The <stdatomic.h> macro ATOMIC_VAR_INIT, previously declared obsolete,
is removed completely in C2x; disable it for C2x in GCC's
implementation. (Although ATOMIC_* are reserved names for this
header, disabling the macro for C2x still seems appropriate.)
Bootstrapped with no regressions for x86_64-pc-linux-gnu.
gcc/
* ginclude/stdatomic.h [defined __STDC_VERSION__ &&
__STDC_VERSION__ > 201710L] (ATOMIC_VAR_INIT): Do not define.
gcc/testsuite/
* gcc.dg/atomic/c2x-stdatomic-var-init-1.c: New test.
Diff:
---
gcc/ginclude/stdatomic.h | 2 ++
gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c | 9 +++++++++
2 files changed, 11 insertions(+)
diff --git a/gcc/ginclude/stdatomic.h b/gcc/ginclude/stdatomic.h
index 9f2475b739d..a56ba5d9639 100644
--- a/gcc/ginclude/stdatomic.h
+++ b/gcc/ginclude/stdatomic.h
@@ -79,7 +79,9 @@ typedef _Atomic __INTMAX_TYPE__ atomic_intmax_t;
typedef _Atomic __UINTMAX_TYPE__ atomic_uintmax_t;
+#if !(defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L)
#define ATOMIC_VAR_INIT(VALUE) (VALUE)
+#endif
/* Initialize an atomic object pointed to by PTR with VAL. */
#define atomic_init(PTR, VAL) \
diff --git a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c b/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c
new file mode 100644
index 00000000000..1978a410350
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c
@@ -0,0 +1,9 @@
+/* Test ATOMIC_VAR_INIT not in C2x. */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x -pedantic-errors" } */
+
+#include <stdatomic.h>
+
+#ifdef ATOMIC_VAR_INIT
+#error "ATOMIC_VAR_INIT defined"
+#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-12 14:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-12 14:35 [gcc r13-2626] stdatomic.h: Do not define ATOMIC_VAR_INIT 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).