From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
	id 8DFBF3857B9B; Fri, 15 Sep 2023 23:18:32 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8DFBF3857B9B
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1694819912;
	bh=KToOGAbzK/vi4gcXGsL1R7BS4Q6pbMBQzHrUmEyubJ4=;
	h=From:To:Subject:Date:From;
	b=niFV/mKuFfPlaj66mOH9D98g+siwcZuS7QRpLLEpPgNgn9XRPrtyTCI3UzYQuDxPe
	 aXJnWtew+Q9PS8wLTyOvX2EItAwKOdSwUbIIY3eeLKWnbi/nOD3un7aNKnnjUe5F8G
	 bac6RaLEZVyXBdvzuRvQRYNBb4Sp3fextQlo9CFw=
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r14-4062] libstdc++: Remove dg-options "-std=gnu++20" from
 <atomic> tests
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 6693bd900419862a7df97caa347f8289e88c2fe7
X-Git-Newrev: 1b13c424da4d2d5e3505ba47786a4ac4f3efb177
Message-Id: <20230915231832.8DFBF3857B9B@sourceware.org>
Date: Fri, 15 Sep 2023 23:18:32 +0000 (GMT)
List-Id: <libstdc++-cvs.sourceware.org>

https://gcc.gnu.org/g:1b13c424da4d2d5e3505ba47786a4ac4f3efb177

commit r14-4062-g1b13c424da4d2d5e3505ba47786a4ac4f3efb177
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Sep 15 14:27:56 2023 +0100

    libstdc++: Remove dg-options "-std=gnu++20" from <atomic> tests
    
    The testsuite will automatically select C++20 for these tests now, and
    removing the hardcoded -std option allows them to be tested for C++23
    and C++26 as well.
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/29_atomics/atomic/compare_exchange_padding.cc:
            Remove dg-options -std=gnu++2a.
            * testsuite/29_atomics/atomic/cons/value_init.cc: Likewise.
            * testsuite/29_atomics/atomic/lock_free_aliases.cc: Likewise.
            * testsuite/29_atomics/atomic/requirements/types_neg.cc:
            Likewise.
            * testsuite/29_atomics/atomic/wait_notify/1.cc: Likewise.
            * testsuite/29_atomics/atomic/wait_notify/100334.cc: Likewise.
            * testsuite/29_atomics/atomic/wait_notify/102994.cc: Likewise.
            * testsuite/29_atomics/atomic/wait_notify/2.cc: Likewise.
            * testsuite/29_atomics/atomic/wait_notify/bool.cc: Likewise.
            * testsuite/29_atomics/atomic/wait_notify/generic.cc: Likewise.
            * testsuite/29_atomics/atomic/wait_notify/pointers.cc: Likewise.
            * testsuite/29_atomics/atomic_flag/cons/value_init.cc: Likewise.
            * testsuite/29_atomics/atomic_flag/test/explicit.cc: Likewise.
            * testsuite/29_atomics/atomic_flag/test/implicit.cc: Likewise.
            * testsuite/29_atomics/atomic_flag/wait_notify/1.cc: Likewise.
            * testsuite/29_atomics/atomic_float/1.cc: Likewise.
            * testsuite/29_atomics/atomic_float/95282.cc: Likewise.
            * testsuite/29_atomics/atomic_float/requirements.cc: Likewise.
            * testsuite/29_atomics/atomic_float/value_init.cc: Likewise.
            * testsuite/29_atomics/atomic_float/wait_notify.cc: Likewise.
            * testsuite/29_atomics/atomic_integral/cons/value_init.cc:
            Likewise.
            * testsuite/29_atomics/atomic_integral/wait_notify.cc: Likewise.
            * testsuite/29_atomics/atomic_ref/compare_exchange_padding.cc:
            Likewise.
            * testsuite/29_atomics/atomic_ref/deduction.cc: Likewise.
            * testsuite/29_atomics/atomic_ref/float.cc: Likewise.
            * testsuite/29_atomics/atomic_ref/generic.cc: Likewise.
            * testsuite/29_atomics/atomic_ref/integral.cc: Likewise.
            * testsuite/29_atomics/atomic_ref/pointer.cc: Likewise.
            * testsuite/29_atomics/atomic_ref/requirements.cc: Likewise.
            * testsuite/29_atomics/headers/atomic/types_std_c++20.cc:
            Likewise.
            * testsuite/29_atomics/headers/atomic/types_std_c++20_neg.cc:
            Likewise.
            * testsuite/29_atomics/headers/atomic/types_std_c++2a.cc:
            Likewise.
            * testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc:
            Likewise.

Diff:
---
 libstdc++-v3/testsuite/29_atomics/atomic/compare_exchange_padding.cc   | 1 -
 libstdc++-v3/testsuite/29_atomics/atomic/cons/value_init.cc            | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic/lock_free_aliases.cc          | 1 -
 libstdc++-v3/testsuite/29_atomics/atomic/requirements/types_neg.cc     | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/1.cc              | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc         | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/102994.cc         | 1 -
 libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/2.cc              | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/bool.cc           | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/generic.cc        | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/pointers.cc       | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/value_init.cc       | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc         | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc         | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc         | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_float/1.cc                    | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_float/95282.cc                | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_float/requirements.cc         | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_float/value_init.cc           | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_float/wait_notify.cc          | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/value_init.cc   | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_integral/wait_notify.cc       | 3 +--
 .../testsuite/29_atomics/atomic_ref/compare_exchange_padding.cc        | 1 -
 libstdc++-v3/testsuite/29_atomics/atomic_ref/deduction.cc              | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_ref/float.cc                  | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_ref/generic.cc                | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_ref/integral.cc               | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_ref/pointer.cc                | 3 +--
 libstdc++-v3/testsuite/29_atomics/atomic_ref/requirements.cc           | 3 +--
 libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++20.cc    | 3 +--
 .../testsuite/29_atomics/headers/atomic/types_std_c++20_neg.cc         | 3 +--
 libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a.cc    | 3 +--
 .../testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc         | 1 -
 33 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/compare_exchange_padding.cc b/libstdc++-v3/testsuite/29_atomics/atomic/compare_exchange_padding.cc
index 2e7ff0307bc..01f7475631e 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/compare_exchange_padding.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/compare_exchange_padding.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 // { dg-add-options libatomic }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/value_init.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/value_init.cc
index b8019486ccf..809c6c02443 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/value_init.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/value_init.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 
 #include <atomic>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/lock_free_aliases.cc b/libstdc++-v3/testsuite/29_atomics/atomic/lock_free_aliases.cc
index 02c4ccc3aa3..8192f73dd47 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/lock_free_aliases.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/lock_free_aliases.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 
 #include <atomic>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/requirements/types_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/requirements/types_neg.cc
index 29a42c5357d..7070fb8f330 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/requirements/types_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/requirements/types_neg.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <atomic>
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/1.cc b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/1.cc
index 2f234595b52..3ded103b4fe 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/1.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/1.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 // { dg-require-effective-target gthreads }
 // { dg-require-effective-target hosted }
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc
index 06e4a2edcbb..78e718e4597 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-gthreads "" }
 // { dg-additional-options "-pthread" { target pthread } }
 // { dg-add-options libatomic }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/102994.cc b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/102994.cc
index 72d9a924ea1..6b77acf6261 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/102994.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/102994.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 // { dg-require-gthreads "" }
 // { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/2.cc b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/2.cc
index 0c4a1b88e57..d07bdeece20 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/2.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/2.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 // { dg-require-effective-target gthreads }
 // { dg-require-effective-target hosted }
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/bool.cc b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/bool.cc
index 0af0c7dd74d..d80d3714137 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/bool.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/bool.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-gthreads "" }
 // { dg-additional-options "-pthread" { target pthread } }
 // { dg-add-options libatomic }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/generic.cc b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/generic.cc
index cdd6c493e64..57fc43ee8e8 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/generic.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/generic.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-gthreads "" }
 // { dg-additional-options "-pthread" { target pthread } }
 // { dg-add-options libatomic }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/pointers.cc b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/pointers.cc
index 10274cca903..0e069f2df9d 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/pointers.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/pointers.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-additional-options "-pthread" { target pthread } }
 // { dg-require-gthreads "" }
 // { dg-add-options libatomic }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/value_init.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/value_init.cc
index 565d1ac4417..084e2930f7e 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/value_init.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/value_init.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 #include <atomic>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc
index fc8d6589707..f223ca18d55 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 
 // Copyright (C) 2008-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc
index 2840055433f..83c984f6f29 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 
 // Copyright (C) 2008-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc
index 777fa915ea1..9c4983dc825 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-gthreads "" }
 // { dg-additional-options "-pthread" { target pthread } }
 // { dg-add-options libatomic }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_float/1.cc b/libstdc++-v3/testsuite/29_atomics/atomic_float/1.cc
index e2e5003cbec..3c2997fb26a 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_float/1.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_float/1.cc
@@ -15,9 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
 // { dg-add-options ieee }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 #include <atomic>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_float/95282.cc b/libstdc++-v3/testsuite/29_atomics/atomic_float/95282.cc
index 1313fdf9b5c..f7ba2867f96 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_float/95282.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_float/95282.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <atomic>
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_float/requirements.cc b/libstdc++-v3/testsuite/29_atomics/atomic_float/requirements.cc
index 832714a16eb..bec94d928d2 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_float/requirements.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_float/requirements.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <atomic>
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_float/value_init.cc b/libstdc++-v3/testsuite/29_atomics/atomic_float/value_init.cc
index 6e89f2fc2a8..9b84e47b8f5 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_float/value_init.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_float/value_init.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 // { dg-add-options libatomic }
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_float/wait_notify.cc b/libstdc++-v3/testsuite/29_atomics/atomic_float/wait_notify.cc
index 50c5be68912..eff3a05672c 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_float/wait_notify.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_float/wait_notify.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-gthreads "" }
 // { dg-additional-options "-pthread" { target pthread } }
 // { dg-add-options libatomic }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/value_init.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/value_init.cc
index 2f6a48d36d8..58b03f30d5f 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/value_init.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/value_init.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 
 #include <atomic>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/wait_notify.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/wait_notify.cc
index 0e6a3075ab5..d032be8c38d 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/wait_notify.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/wait_notify.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-gthreads "" }
 // { dg-add-options libatomic }
 // { dg-additional-options "-pthread" { target pthread } }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_ref/compare_exchange_padding.cc b/libstdc++-v3/testsuite/29_atomics/atomic_ref/compare_exchange_padding.cc
index 8469ebf8a14..2a3d1d468c2 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/compare_exchange_padding.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/compare_exchange_padding.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 // { dg-add-options libatomic }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_ref/deduction.cc b/libstdc++-v3/testsuite/29_atomics/atomic_ref/deduction.cc
index 1298b784f51..dbefc9b615a 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/deduction.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/deduction.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <atomic>
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_ref/float.cc b/libstdc++-v3/testsuite/29_atomics/atomic_ref/float.cc
index a34aa391d1e..82db34a86cc 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/float.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/float.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 #include <atomic>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_ref/generic.cc b/libstdc++-v3/testsuite/29_atomics/atomic_ref/generic.cc
index adae07f8754..f8751756d02 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/generic.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/generic.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 // { dg-add-options libatomic }
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_ref/integral.cc b/libstdc++-v3/testsuite/29_atomics/atomic_ref/integral.cc
index a98adb7fbba..eb22afca03a 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/integral.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/integral.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 // { dg-add-options libatomic }
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_ref/pointer.cc b/libstdc++-v3/testsuite/29_atomics/atomic_ref/pointer.cc
index b9c7d844b8c..6fe00b55756 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/pointer.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/pointer.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 // { dg-require-thread-fence "" }
 // { dg-add-options libatomic }
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_ref/requirements.cc b/libstdc++-v3/testsuite/29_atomics/atomic_ref/requirements.cc
index 5e61d80bc5a..42be6e4205c 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/requirements.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/requirements.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <atomic>
 
diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++20.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++20.cc
index 3440347d5c2..71bf22faf7c 100644
--- a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++20.cc
+++ b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++20.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 // { dg-require-cstdint "" }
 
 // Copyright (C) 2008-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++20_neg.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++20_neg.cc
index fcf9e97cea5..3dfdfe41ddc 100644
--- a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++20_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++20_neg.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 // { dg-require-cstdint "" }
 
 // Copyright (C) 2009-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a.cc
index 4e5bf25e516..fe6c9fe8506 100644
--- a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a.cc
+++ b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 // Copyright (C) 2019-2023 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc
index 65199ce15e5..42e67939497 100644
--- a/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/headers/atomic/types_std_c++2a_neg.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++2a" }
 // { dg-do compile { target c++20 } }
 // Disable PCH because <bits/stdc++.h> includes <stdatomic.h> which declares
 // memory_order in the global namespace.