This is v2 of patch 6/13, because I missed three files in the first
patch.
Tested aarch64-linux. I intend to push this (and the rest of the series)
soon.
-- >8 --
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/std/concepts/1.cc: Remove dg-options.
* testsuite/std/concepts/2.cc: Likewise.
* testsuite/std/concepts/concepts.callable/invocable.cc:
Likewise.
* testsuite/std/concepts/concepts.callable/regular_invocable.cc:
Likewise.
* testsuite/std/concepts/concepts.callable/relation.cc:
Likewise.
* testsuite/std/concepts/concepts.callable/strictweakorder.cc:
Likewise.
*
testsuite/std/concepts/concepts.lang/concept.arithmetic/floating_point.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.arithmetic/integral.cc:
Likewise.
*
testsuite/std/concepts/concepts.lang/concept.arithmetic/signed_integral.cc:
Likewise.
*
testsuite/std/concepts/concepts.lang/concept.arithmetic/unsigned_integral.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.assignable/1.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.common/1.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.commonref/1.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.constructible/1.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.convertible/1.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.copyconstructible/1.cc:
Likewise.
*
testsuite/std/concepts/concepts.lang/concept.defaultinitializable/1.cc:
Likewise.
*
testsuite/std/concepts/concepts.lang/concept.defaultinitializable/lwg3149.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.derived/1.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.destructible/1.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.moveconstructible/1.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.same/1.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.swappable/swap.cc:
Likewise.
* testsuite/std/concepts/concepts.lang/concept.swappable/swappable.cc:
Likewise.
*
testsuite/std/concepts/concepts.lang/concept.swappable/swappable_with.cc:
Likewise.
* testsuite/std/concepts/concepts.object/copyable.cc: Likewise.
* testsuite/std/concepts/concepts.object/movable.cc: Likewise.
* testsuite/std/concepts/concepts.object/regular.cc: Likewise.
* testsuite/std/concepts/concepts.object/semiregular.cc:
Likewise.
* testsuite/std/ranges/97600.cc: Likewise.
* testsuite/std/ranges/access/101782.cc: Likewise.
* testsuite/std/ranges/access/begin.cc: Likewise.
* testsuite/std/ranges/access/begin_neg.cc: Likewise.
* testsuite/std/ranges/access/cbegin.cc: Likewise.
* testsuite/std/ranges/access/cdata.cc: Likewise.
* testsuite/std/ranges/access/cend.cc: Likewise.
* testsuite/std/ranges/access/crbegin.cc: Likewise.
* testsuite/std/ranges/access/crend.cc: Likewise.
* testsuite/std/ranges/access/data.cc: Likewise.
* testsuite/std/ranges/access/empty.cc: Likewise.
* testsuite/std/ranges/access/end.cc: Likewise.
* testsuite/std/ranges/access/end_neg.cc: Likewise.
* testsuite/std/ranges/access/lwg3467.cc: Likewise.
* testsuite/std/ranges/access/p2602.cc: Likewise.
* testsuite/std/ranges/access/rbegin.cc: Likewise.
* testsuite/std/ranges/access/rend.cc: Likewise.
* testsuite/std/ranges/access/size.cc: Likewise.
* testsuite/std/ranges/access/size_neg.cc: Likewise.
* testsuite/std/ranges/access/ssize.cc: Likewise.
* testsuite/std/ranges/adaptors/100479.cc: Likewise.
* testsuite/std/ranges/adaptors/100577.cc: Likewise.
* testsuite/std/ranges/adaptors/93978.cc: Likewise.
* testsuite/std/ranges/adaptors/95322.cc: Likewise.
* testsuite/std/ranges/adaptors/99433.cc: Likewise.
* testsuite/std/ranges/adaptors/all.cc: Likewise.
* testsuite/std/ranges/adaptors/common.cc: Likewise.
* testsuite/std/ranges/adaptors/conditionally_borrowed.cc:
Likewise.
* testsuite/std/ranges/adaptors/counted.cc: Likewise.
* testsuite/std/ranges/adaptors/detail/copyable_box.cc:
Likewise.
* testsuite/std/ranges/adaptors/drop.cc: Likewise.
* testsuite/std/ranges/adaptors/drop_while.cc: Likewise.
* testsuite/std/ranges/adaptors/elements.cc: Likewise.
* testsuite/std/ranges/adaptors/filter.cc: Likewise.
* testsuite/std/ranges/adaptors/join.cc: Likewise.
* testsuite/std/ranges/adaptors/lazy_split.cc: Likewise.
* testsuite/std/ranges/adaptors/lazy_split_neg.cc: Likewise.
* testsuite/std/ranges/adaptors/lwg3286.cc: Likewise.
* testsuite/std/ranges/adaptors/lwg3313_neg.cc: Likewise.
* testsuite/std/ranges/adaptors/lwg3325_neg.cc: Likewise.
* testsuite/std/ranges/adaptors/lwg3406.cc: Likewise.
* testsuite/std/ranges/adaptors/p1739.cc: Likewise.
* testsuite/std/ranges/adaptors/p2281.cc: Likewise.
* testsuite/std/ranges/adaptors/p2770r0.cc: Likewise.
* testsuite/std/ranges/adaptors/reverse.cc: Likewise.
* testsuite/std/ranges/adaptors/sizeof.cc: Likewise.
* testsuite/std/ranges/adaptors/split.cc: Likewise.
* testsuite/std/ranges/adaptors/take.cc: Likewise.
* testsuite/std/ranges/adaptors/take_while.cc: Likewise.
* testsuite/std/ranges/adaptors/transform.cc: Likewise.
* testsuite/std/ranges/empty_view.cc: Likewise.
* testsuite/std/ranges/headers/ranges/synopsis.cc: Likewise.
* testsuite/std/ranges/iota/difference_type.cc: Likewise.
* testsuite/std/ranges/iota/iota_view.cc: Likewise.
* testsuite/std/ranges/iota/iterator.cc: Likewise.
* testsuite/std/ranges/iota/lwg3292_neg.cc: Likewise.
* testsuite/std/ranges/iota/max_size_type.cc: Likewise.
* testsuite/std/ranges/istream_view.cc: Likewise.
* testsuite/std/ranges/p2259.cc: Likewise.
* testsuite/std/ranges/p2325.cc: Likewise.
* testsuite/std/ranges/p2367.cc: Likewise.
* testsuite/std/ranges/range.cc: Likewise.
* testsuite/std/ranges/refinements.cc: Likewise.
* testsuite/std/ranges/safe_range.cc: Likewise.
* testsuite/std/ranges/safe_range_types.cc: Likewise.
* testsuite/std/ranges/single_view.cc: Likewise.
* testsuite/std/ranges/sized.cc: Likewise.
* testsuite/std/ranges/subrange/1.cc: Likewise.
* testsuite/std/ranges/subrange/97512.cc: Likewise.
* testsuite/std/ranges/subrange/constexpr.cc: Likewise.
* testsuite/std/ranges/subrange/lwg3282_neg.cc: Likewise.
* testsuite/std/ranges/subrange/lwg3286.cc: Likewise.
* testsuite/std/ranges/subrange/lwg3433.cc: Likewise.
* testsuite/std/ranges/subrange/sizeof.cc: Likewise.
* testsuite/std/ranges/subrange/tuple_like.cc: Likewise.
* testsuite/std/ranges/view.cc: Likewise.
---
libstdc++-v3/testsuite/std/concepts/1.cc | 3 +--
libstdc++-v3/testsuite/std/concepts/2.cc | 3 +--
.../testsuite/std/concepts/concepts.callable/invocable.cc | 3 +--
.../std/concepts/concepts.callable/regular_invocable.cc | 3 +--
.../testsuite/std/concepts/concepts.callable/relation.cc | 3 +--
.../std/concepts/concepts.callable/strictweakorder.cc | 3 +--
.../concepts.lang/concept.arithmetic/floating_point.cc | 3 +--
.../concepts/concepts.lang/concept.arithmetic/integral.cc | 3 +--
.../concepts.lang/concept.arithmetic/signed_integral.cc | 3 +--
.../concepts.lang/concept.arithmetic/unsigned_integral.cc | 3 +--
.../std/concepts/concepts.lang/concept.assignable/1.cc | 3 +--
.../std/concepts/concepts.lang/concept.common/1.cc | 3 +--
.../std/concepts/concepts.lang/concept.commonref/1.cc | 3 +--
.../std/concepts/concepts.lang/concept.constructible/1.cc | 3 +--
.../std/concepts/concepts.lang/concept.convertible/1.cc | 3 +--
.../concepts/concepts.lang/concept.copyconstructible/1.cc | 3 +--
.../concepts.lang/concept.defaultinitializable/1.cc | 3 +--
.../concepts.lang/concept.defaultinitializable/lwg3149.cc | 3 +--
.../std/concepts/concepts.lang/concept.derived/1.cc | 3 +--
.../std/concepts/concepts.lang/concept.destructible/1.cc | 3 +--
.../concepts/concepts.lang/concept.moveconstructible/1.cc | 3 +--
.../testsuite/std/concepts/concepts.lang/concept.same/1.cc | 3 +--
.../std/concepts/concepts.lang/concept.swappable/swap.cc | 3 +--
.../concepts/concepts.lang/concept.swappable/swappable.cc | 3 +--
.../concepts.lang/concept.swappable/swappable_with.cc | 3 +--
.../testsuite/std/concepts/concepts.object/copyable.cc | 3 +--
.../testsuite/std/concepts/concepts.object/movable.cc | 3 +--
.../testsuite/std/concepts/concepts.object/regular.cc | 3 +--
.../testsuite/std/concepts/concepts.object/semiregular.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/97600.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/101782.cc | 2 +-
libstdc++-v3/testsuite/std/ranges/access/begin.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/begin_neg.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/cbegin.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/cdata.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/cend.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/crbegin.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/crend.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/data.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/empty.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/end.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/end_neg.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/lwg3467.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/p2602.cc | 1 -
libstdc++-v3/testsuite/std/ranges/access/rbegin.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/rend.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/size.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/size_neg.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/access/ssize.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/100479.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/100577.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/93978.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/99433.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/all.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/common.cc | 3 +--
.../std/ranges/adaptors/conditionally_borrowed.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/counted.cc | 3 +--
.../testsuite/std/ranges/adaptors/detail/copyable_box.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/drop.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/drop_while.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/filter.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/join.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc | 3 +--
.../testsuite/std/ranges/adaptors/lazy_split_neg.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/lwg3286.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/lwg3313_neg.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/lwg3325_neg.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/lwg3406.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/p1739.cc | 1 -
libstdc++-v3/testsuite/std/ranges/adaptors/p2281.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/p2770r0.cc | 1 -
libstdc++-v3/testsuite/std/ranges/adaptors/reverse.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/sizeof.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/split.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/take.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/take_while.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/adaptors/transform.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/empty_view.cc | 3 +--
.../testsuite/std/ranges/headers/ranges/synopsis.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/iota/difference_type.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/iota/iota_view.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/iota/iterator.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/iota/lwg3292_neg.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/iota/max_size_type.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/istream_view.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/p2259.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/p2325.cc | 1 -
libstdc++-v3/testsuite/std/ranges/p2367.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/range.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/refinements.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/safe_range.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/safe_range_types.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/single_view.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/sized.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/subrange/1.cc | 1 -
libstdc++-v3/testsuite/std/ranges/subrange/97512.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/subrange/constexpr.cc | 1 -
libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc | 7 +++----
libstdc++-v3/testsuite/std/ranges/subrange/lwg3286.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/subrange/lwg3433.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/subrange/sizeof.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/subrange/tuple_like.cc | 3 +--
libstdc++-v3/testsuite/std/ranges/view.cc | 3 +--
105 files changed, 101 insertions(+), 205 deletions(-)
diff --git a/libstdc++-v3/testsuite/std/concepts/1.cc
b/libstdc++-v3/testsuite/std/concepts/1.cc
index add7b0e83b4..0301b91e869 100644
--- a/libstdc++-v3/testsuite/std/concepts/1.cc
+++ b/libstdc++-v3/testsuite/std/concepts/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 preprocess { target c++2a } }
+// { dg-do preprocess { target c++20 } }
#include <concepts>
diff --git a/libstdc++-v3/testsuite/std/concepts/2.cc
b/libstdc++-v3/testsuite/std/concepts/2.cc
index 0098a2e2f85..53a1e006993 100644
--- a/libstdc++-v3/testsuite/std/concepts/2.cc
+++ b/libstdc++-v3/testsuite/std/concepts/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 preprocess { target c++2a } }
+// { dg-do preprocess { target c++20 } }
#include <version>
diff --git a/libstdc++-v3/testsuite/std/concepts/concepts.callable/invocable.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.callable/invocable.cc
index bb9849b196f..9a19854746f 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.callable/invocable.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.callable/invocable.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 <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.callable/regular_invocable.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.callable/regular_invocable.cc
index a18fbfc3c1a..98f58f9864b 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.callable/regular_invocable.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.callable/regular_invocable.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 <concepts>
diff --git a/libstdc++-v3/testsuite/std/concepts/concepts.callable/relation.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.callable/relation.cc
index 75cbbdf96db..6c3e182f19c 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.callable/relation.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.callable/relation.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 <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.callable/strictweakorder.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.callable/strictweakorder.cc
index b43d485161c..36861759984 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.callable/strictweakorder.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.callable/strictweakorder.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 <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/floating_point.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/floating_point.cc
index 15f892b76f6..96d9588f2b8 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/floating_point.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/floating_point.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 <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/integral.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/integral.cc
index b9cc5cd251e..53ea3e39433 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/integral.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/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 compile { target c++2a } }
+// { dg-do compile { target c++20 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/signed_integral.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/signed_integral.cc
index 6e18e916547..906a2bf7433 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/signed_integral.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/signed_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 compile { target c++2a } }
+// { dg-do compile { target c++20 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/unsigned_integral.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/unsigned_integral.cc
index 8578dc0b463..37e80fcd068 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/unsigned_integral.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.arithmetic/unsigned_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 compile { target c++2a } }
+// { dg-do compile { target c++20 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.assignable/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.assignable/1.cc
index b0aca56d944..fd45713558f 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.assignable/1.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.assignable/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.common/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.common/1.cc
index 4d6254c3d2c..6b7c32948c4 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.common/1.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.common/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.commonref/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.commonref/1.cc
index 118ee8c4b58..f56e0b04878 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.commonref/1.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.commonref/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.constructible/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.constructible/1.cc
index b66c286d67a..d6c985ea81f 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.constructible/1.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.constructible/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.convertible/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.convertible/1.cc
index cc2bc945458..eaa624e9c1d 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.convertible/1.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.convertible/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.copyconstructible/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.copyconstructible/1.cc
index 9f6f3f77023..7d4a66fcf26 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.copyconstructible/1.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.copyconstructible/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.defaultinitializable/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.defaultinitializable/1.cc
index 4a479742c1a..be020a9c97a 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.defaultinitializable/1.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.defaultinitializable/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.defaultinitializable/lwg3149.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.defaultinitializable/lwg3149.cc
index 7f49a2a9647..53b3d1fd81a 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.defaultinitializable/lwg3149.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.defaultinitializable/lwg3149.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 <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.derived/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.derived/1.cc
index f877d53eb13..8624b3559f0 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.derived/1.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.derived/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.destructible/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.destructible/1.cc
index 29ab5146544..2f915bc9ef2 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.destructible/1.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.destructible/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.moveconstructible/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.moveconstructible/1.cc
index 26debdf0ab1..a540f91978e 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.moveconstructible/1.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.moveconstructible/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.same/1.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.same/1.cc
index 7dbaa08281a..3537ed2beff 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.same/1.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.same/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 } }
#include <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swap.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swap.cc
index 2bc7a434e0f..050270762e1 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swap.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swap.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 <concepts>
#include <testsuite_hooks.h>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swappable.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swappable.cc
index d0487e04998..76e23e23e0e 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swappable.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swappable.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 <concepts>
diff --git
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swappable_with.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swappable_with.cc
index 90db5a91b54..5a956dc2d6c 100644
---
a/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swappable_with.cc
+++
b/libstdc++-v3/testsuite/std/concepts/concepts.lang/concept.swappable/swappable_with.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 <concepts>
diff --git a/libstdc++-v3/testsuite/std/concepts/concepts.object/copyable.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.object/copyable.cc
index 3fab3d8e372..cece9109640 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.object/copyable.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.object/copyable.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 <concepts>
diff --git a/libstdc++-v3/testsuite/std/concepts/concepts.object/movable.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.object/movable.cc
index e087a66a96c..16f39277627 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.object/movable.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.object/movable.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 <concepts>
diff --git a/libstdc++-v3/testsuite/std/concepts/concepts.object/regular.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.object/regular.cc
index 3dcc66a3c2f..485dc42b2f4 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.object/regular.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.object/regular.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 <concepts>
diff --git a/libstdc++-v3/testsuite/std/concepts/concepts.object/semiregular.cc
b/libstdc++-v3/testsuite/std/concepts/concepts.object/semiregular.cc
index 633a9f1fe8c..0d1c9f78f1b 100644
--- a/libstdc++-v3/testsuite/std/concepts/concepts.object/semiregular.cc
+++ b/libstdc++-v3/testsuite/std/concepts/concepts.object/semiregular.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 <concepts>
diff --git a/libstdc++-v3/testsuite/std/ranges/97600.cc
b/libstdc++-v3/testsuite/std/ranges/97600.cc
index 7da0542b19e..569a4ef8e2e 100644
--- a/libstdc++-v3/testsuite/std/ranges/97600.cc
+++ b/libstdc++-v3/testsuite/std/ranges/97600.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 } }
// PR libstdc++/97600
diff --git a/libstdc++-v3/testsuite/std/ranges/access/101782.cc
b/libstdc++-v3/testsuite/std/ranges/access/101782.cc
index abb0c8dab0f..25fea793355 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/101782.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/101782.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -fconcepts-ts" }
+// { dg-options "-fconcepts-ts" }
// { dg-do compile { target c++20 } }
// PR testsuite/101782
diff --git a/libstdc++-v3/testsuite/std/ranges/access/begin.cc
b/libstdc++-v3/testsuite/std/ranges/access/begin.cc
index 0bc09992666..ac813df32f1 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/begin.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/begin.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/begin_neg.cc
b/libstdc++-v3/testsuite/std/ranges/access/begin_neg.cc
index 0be7358e9a3..023ea0e9aef 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/begin_neg.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/begin_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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/cbegin.cc
b/libstdc++-v3/testsuite/std/ranges/access/cbegin.cc
index 3667b0d021f..0b53a6e6ff3 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/cbegin.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/cbegin.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 <ranges>
#include <utility> // as_const
diff --git a/libstdc++-v3/testsuite/std/ranges/access/cdata.cc
b/libstdc++-v3/testsuite/std/ranges/access/cdata.cc
index d69b04c8f74..69c9112d2ce 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/cdata.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/cdata.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/cend.cc
b/libstdc++-v3/testsuite/std/ranges/access/cend.cc
index 3726ebbf118..aa304fe4564 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/cend.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/cend.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 <ranges>
#include <utility> // as_const
diff --git a/libstdc++-v3/testsuite/std/ranges/access/crbegin.cc
b/libstdc++-v3/testsuite/std/ranges/access/crbegin.cc
index 95b4607fdf1..04217164199 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/crbegin.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/crbegin.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/crend.cc
b/libstdc++-v3/testsuite/std/ranges/access/crend.cc
index 2e4c0f3197a..5ef218bbbfa 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/crend.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/crend.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/data.cc
b/libstdc++-v3/testsuite/std/ranges/access/data.cc
index 366db744440..1e3d6f20e89 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/data.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/data.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/empty.cc
b/libstdc++-v3/testsuite/std/ranges/access/empty.cc
index 51898ec0c8f..a0b474c0bbe 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/empty.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/empty.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/end.cc
b/libstdc++-v3/testsuite/std/ranges/access/end.cc
index 6c96b313dbb..f795e703439 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/end.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/end.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 <ranges>
#include <utility> // as_const
diff --git a/libstdc++-v3/testsuite/std/ranges/access/end_neg.cc
b/libstdc++-v3/testsuite/std/ranges/access/end_neg.cc
index 6e19cbd59a7..7daeec0a9bc 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/end_neg.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/end_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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/lwg3467.cc
b/libstdc++-v3/testsuite/std/ranges/access/lwg3467.cc
index e5b3be093cb..6fed9029279 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/lwg3467.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/lwg3467.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 } }
// LWG 3467. bool can't be an integer-like type
diff --git a/libstdc++-v3/testsuite/std/ranges/access/p2602.cc
b/libstdc++-v3/testsuite/std/ranges/access/p2602.cc
index 9c6a0e6ee95..8c403c1c3b6 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/p2602.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/p2602.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// P2602R2 Poison Pills are Too Toxic
diff --git a/libstdc++-v3/testsuite/std/ranges/access/rbegin.cc
b/libstdc++-v3/testsuite/std/ranges/access/rbegin.cc
index b7314b824ed..ad9deebedd0 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/rbegin.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/rbegin.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/rend.cc
b/libstdc++-v3/testsuite/std/ranges/access/rend.cc
index d3d90418411..3e25c9037e0 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/rend.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/rend.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/size.cc
b/libstdc++-v3/testsuite/std/ranges/access/size.cc
index e52e2968eb3..a5795a6b9dd 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/size.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/size.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/size_neg.cc
b/libstdc++-v3/testsuite/std/ranges/access/size_neg.cc
index 2cb85636fa1..446d833d6d1 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/size_neg.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/size_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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/ssize.cc
b/libstdc++-v3/testsuite/std/ranges/access/ssize.cc
index abc6997eebb..47021350dd6 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/ssize.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/ssize.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 <ranges>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/100479.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/100479.cc
index a8cb5036c60..8f5814c21b1 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/100479.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/100479.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 } }
// PR libstdc++/100479
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/100577.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/100577.cc
index 59f8819c201..29fa07359c1 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/100577.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/100577.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 } }
// PR libstdc++/100577
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/93978.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/93978.cc
index 256ee7f6774..9690a376408 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/93978.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/93978.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-additional-options "-O -Wall" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
#include <ranges>
#include <vector>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc
index 792bbfff922..f5832768cdd 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc
@@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++20" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
#include <ranges>
#include <testsuite_iterators.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/99433.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/99433.cc
index c9fcc11e06e..bb86806ca01 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/99433.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/99433.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 } }
// PR libstdc++/99433
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc
index 6bbaf73a20a..dadd08122ba 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/all.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 <algorithm>
#include <array>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/common.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/common.cc
index 2e179c33592..8404317bf2c 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/common.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/common.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 <algorithm>
#include <ranges>
diff --git
a/libstdc++-v3/testsuite/std/ranges/adaptors/conditionally_borrowed.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/conditionally_borrowed.cc
index 0f813d34481..77b802a105f 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/conditionally_borrowed.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/conditionally_borrowed.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 <ranges>
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/counted.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/counted.cc
index d99e9628507..89fea4643d5 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/counted.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/counted.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/detail/copyable_box.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/detail/copyable_box.cc
index 209ce3ec3ee..dbc1fd23412 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/detail/copyable_box.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/detail/copyable_box.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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/drop.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/drop.cc
index 2c4047dbaa3..4f4030c46a5 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/drop.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/drop.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/drop_while.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/drop_while.cc
index 5022e52b346..0d3a88da118 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/drop_while.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/drop_while.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc
index 1b49282a206..05ccec49b01 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/filter.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/filter.cc
index 2ad365327ea..9a9b2ac34d9 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/filter.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/filter.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc
index 7401d69b30d..377b771eb3e 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join.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 <algorithm>
#include <array>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc
index 4e5c0dc3ed5..5895b7e851a 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split_neg.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split_neg.cc
index 6c6fe1703f5..cd569bbf972 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split_neg.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split_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 } }
// { dg-require-effective-target hosted }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3286.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3286.cc
index e30945fbf18..1c1c590b866 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3286.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3286.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 <ranges>
#include <testsuite_iterators.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3313_neg.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3313_neg.cc
index 2fe119efbe3..d0a07c7bdb7 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3313_neg.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3313_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 <array>
#include <iterator>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3325_neg.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3325_neg.cc
index 24e7e5cff9b..60960a57267 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3325_neg.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3325_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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3406.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3406.cc
index 68d41b49d4a..7e87fb6fa31 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3406.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3406.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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/p1739.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/p1739.cc
index a1e66738789..d9188ba8866 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/p1739.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/p1739.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/p2281.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/p2281.cc
index 2025ddb1459..3785c88a5b5 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/p2281.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/p2281.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/p2770r0.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/p2770r0.cc
index 15d71b2faa9..e754da4562b 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/p2770r0.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/p2770r0.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/reverse.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/reverse.cc
index b07883eeaa9..647f4ccd5b6 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/reverse.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/reverse.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/sizeof.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/sizeof.cc
index f420afc46a0..2efb53fd785 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/sizeof.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/sizeof.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 <ranges>
#include <string_view>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc
index d49d594d570..1d96269ac96 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/split.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/take.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/take.cc
index a1f6068bc09..91c62619774 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/take.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/take.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 <algorithm>
#include <forward_list>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/take_while.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/take_while.cc
index 098091edc8b..7476b8f6997 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/take_while.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/take_while.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 <algorithm>
#include <forward_list>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/transform.cc
b/libstdc++-v3/testsuite/std/ranges/adaptors/transform.cc
index d9801d5abb3..b6d49810bc7 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/transform.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/transform.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/empty_view.cc
b/libstdc++-v3/testsuite/std/ranges/empty_view.cc
index ea5a106d106..21ea3058c8c 100644
--- a/libstdc++-v3/testsuite/std/ranges/empty_view.cc
+++ b/libstdc++-v3/testsuite/std/ranges/empty_view.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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/headers/ranges/synopsis.cc
b/libstdc++-v3/testsuite/std/ranges/headers/ranges/synopsis.cc
index 67af2f867c9..dfa3fcaa37e 100644
--- a/libstdc++-v3/testsuite/std/ranges/headers/ranges/synopsis.cc
+++ b/libstdc++-v3/testsuite/std/ranges/headers/ranges/synopsis.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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/iota/difference_type.cc
b/libstdc++-v3/testsuite/std/ranges/iota/difference_type.cc
index 0af3cdc56e8..9375492832b 100644
--- a/libstdc++-v3/testsuite/std/ranges/iota/difference_type.cc
+++ b/libstdc++-v3/testsuite/std/ranges/iota/difference_type.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 <ranges>
#include <limits>
diff --git a/libstdc++-v3/testsuite/std/ranges/iota/iota_view.cc
b/libstdc++-v3/testsuite/std/ranges/iota/iota_view.cc
index 0d2eaf1d0c2..134e20f3062 100644
--- a/libstdc++-v3/testsuite/std/ranges/iota/iota_view.cc
+++ b/libstdc++-v3/testsuite/std/ranges/iota/iota_view.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/iota/iterator.cc
b/libstdc++-v3/testsuite/std/ranges/iota/iterator.cc
index 4b2ac3af47a..7ae5b2edebe 100644
--- a/libstdc++-v3/testsuite/std/ranges/iota/iterator.cc
+++ b/libstdc++-v3/testsuite/std/ranges/iota/iterator.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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/iota/lwg3292_neg.cc
b/libstdc++-v3/testsuite/std/ranges/iota/lwg3292_neg.cc
index f15d8aa3229..ea7721f5c43 100644
--- a/libstdc++-v3/testsuite/std/ranges/iota/lwg3292_neg.cc
+++ b/libstdc++-v3/testsuite/std/ranges/iota/lwg3292_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 } }
// { dg-require-effective-target hosted }
#include <sstream>
diff --git a/libstdc++-v3/testsuite/std/ranges/iota/max_size_type.cc
b/libstdc++-v3/testsuite/std/ranges/iota/max_size_type.cc
index 54c26ba2b4b..a1fbc3241dc 100644
--- a/libstdc++-v3/testsuite/std/ranges/iota/max_size_type.cc
+++ b/libstdc++-v3/testsuite/std/ranges/iota/max_size_type.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-timeout-factor 4 }
#include <limits>
diff --git a/libstdc++-v3/testsuite/std/ranges/istream_view.cc
b/libstdc++-v3/testsuite/std/ranges/istream_view.cc
index cc1c3e006b9..14ec85a4048 100644
--- a/libstdc++-v3/testsuite/std/ranges/istream_view.cc
+++ b/libstdc++-v3/testsuite/std/ranges/istream_view.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/p2259.cc
b/libstdc++-v3/testsuite/std/ranges/p2259.cc
index 0e816bd7157..fb0de984a1a 100644
--- a/libstdc++-v3/testsuite/std/ranges/p2259.cc
+++ b/libstdc++-v3/testsuite/std/ranges/p2259.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 } }
// Verify P2259 changes.
diff --git a/libstdc++-v3/testsuite/std/ranges/p2325.cc
b/libstdc++-v3/testsuite/std/ranges/p2325.cc
index accd2655b95..23d63070d97 100644
--- a/libstdc++-v3/testsuite/std/ranges/p2325.cc
+++ b/libstdc++-v3/testsuite/std/ranges/p2325.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-require-effective-target hosted }
// P2325R3 "Views should not be required to be default constructible"
diff --git a/libstdc++-v3/testsuite/std/ranges/p2367.cc
b/libstdc++-v3/testsuite/std/ranges/p2367.cc
index 13bd2c9bc53..9a034a313dd 100644
--- a/libstdc++-v3/testsuite/std/ranges/p2367.cc
+++ b/libstdc++-v3/testsuite/std/ranges/p2367.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 } }
// Verify P2367 changes.
diff --git a/libstdc++-v3/testsuite/std/ranges/range.cc
b/libstdc++-v3/testsuite/std/ranges/range.cc
index f721ec38718..728fd66b2d2 100644
--- a/libstdc++-v3/testsuite/std/ranges/range.cc
+++ b/libstdc++-v3/testsuite/std/ranges/range.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 <ranges>
#include <testsuite_iterators.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/refinements.cc
b/libstdc++-v3/testsuite/std/ranges/refinements.cc
index 582bf62e805..27351d0adc7 100644
--- a/libstdc++-v3/testsuite/std/ranges/refinements.cc
+++ b/libstdc++-v3/testsuite/std/ranges/refinements.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 <ranges>
#include <testsuite_iterators.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/safe_range.cc
b/libstdc++-v3/testsuite/std/ranges/safe_range.cc
index bdebfe8e235..fc3bdd0b630 100644
--- a/libstdc++-v3/testsuite/std/ranges/safe_range.cc
+++ b/libstdc++-v3/testsuite/std/ranges/safe_range.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 <ranges>
#include <testsuite_iterators.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/safe_range_types.cc
b/libstdc++-v3/testsuite/std/ranges/safe_range_types.cc
index fc43871f847..c123afc5681 100644
--- a/libstdc++-v3/testsuite/std/ranges/safe_range_types.cc
+++ b/libstdc++-v3/testsuite/std/ranges/safe_range_types.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 <ranges>
#include <span>
diff --git a/libstdc++-v3/testsuite/std/ranges/single_view.cc
b/libstdc++-v3/testsuite/std/ranges/single_view.cc
index 8dfe6bb4bd1..336e3bcb215 100644
--- a/libstdc++-v3/testsuite/std/ranges/single_view.cc
+++ b/libstdc++-v3/testsuite/std/ranges/single_view.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 <ranges>
#include <utility> // as_const
diff --git a/libstdc++-v3/testsuite/std/ranges/sized.cc
b/libstdc++-v3/testsuite/std/ranges/sized.cc
index 17bbd082e22..9a9ef9cd4e4 100644
--- a/libstdc++-v3/testsuite/std/ranges/sized.cc
+++ b/libstdc++-v3/testsuite/std/ranges/sized.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 <ranges>
#include <testsuite_iterators.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/1.cc
b/libstdc++-v3/testsuite/std/ranges/subrange/1.cc
index 8a53261c78c..4a29c79e046 100644
--- a/libstdc++-v3/testsuite/std/ranges/subrange/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/subrange/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/97512.cc
b/libstdc++-v3/testsuite/std/ranges/subrange/97512.cc
index c4b1ef7ed99..184feabbde8 100644
--- a/libstdc++-v3/testsuite/std/ranges/subrange/97512.cc
+++ b/libstdc++-v3/testsuite/std/ranges/subrange/97512.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 } }
// PR libstdc++/97512
// Check that structured bindings work for subranges without <ranges>.
diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/constexpr.cc
b/libstdc++-v3/testsuite/std/ranges/subrange/constexpr.cc
index f5bc52bef84..295042f5e3d 100644
--- a/libstdc++-v3/testsuite/std/ranges/subrange/constexpr.cc
+++ b/libstdc++-v3/testsuite/std/ranges/subrange/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc
b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc
index dafaf25a6f9..c7d93a45f26 100644
--- a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_neg.cc
+++ b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3282_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 <ranges>
@@ -36,9 +35,9 @@ test_lwg3404()
// LWG 3404. Finish removing subrange's conversions from pair-like
std::pair<char*, char*> p;
subrange sb1(p); // { dg-error "no matching function" }
- // { dg-error "class template argument deduction" "" { target *-*-* } 38 }
+ // { dg-error "class template argument deduction" "" { target *-*-* } 37 }
subrange sb2(p, p.second - p.first); // { dg-error "no matching function" }
- // { dg-error "class template argument deduction" "" { target *-*-* } 40 }
+ // { dg-error "class template argument deduction" "" { target *-*-* } 39 }
// { dg-prune-output "in requirements with" }
}
diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3286.cc
b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3286.cc
index c46523ca768..f4dc233fbee 100644
--- a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3286.cc
+++ b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3286.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 <ranges>
#include <testsuite_iterators.h>
diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3433.cc
b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3433.cc
index 559c5bca236..c7a33c83cdf 100644
--- a/libstdc++-v3/testsuite/std/ranges/subrange/lwg3433.cc
+++ b/libstdc++-v3/testsuite/std/ranges/subrange/lwg3433.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 <algorithm>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/sizeof.cc
b/libstdc++-v3/testsuite/std/ranges/subrange/sizeof.cc
index 1e7c7c10e49..7d3a4eb0c32 100644
--- a/libstdc++-v3/testsuite/std/ranges/subrange/sizeof.cc
+++ b/libstdc++-v3/testsuite/std/ranges/subrange/sizeof.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 <iterator>
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/tuple_like.cc
b/libstdc++-v3/testsuite/std/ranges/subrange/tuple_like.cc
index c3450fe9020..742fdc45c2e 100644
--- a/libstdc++-v3/testsuite/std/ranges/subrange/tuple_like.cc
+++ b/libstdc++-v3/testsuite/std/ranges/subrange/tuple_like.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 <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/view.cc
b/libstdc++-v3/testsuite/std/ranges/view.cc
index 94e285b30ee..bfc52ffcd82 100644
--- a/libstdc++-v3/testsuite/std/ranges/view.cc
+++ b/libstdc++-v3/testsuite/std/ranges/view.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 <ranges>
#include <span>
--
2.41.0
