public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-4066] libstdc++: Remove dg-options "-std=gnu++20" from 23_containers tests
@ 2023-09-15 23:18 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2023-09-15 23:18 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:b9a2dce8c45b7b35f6d5811a6c1c0ee53d2af0c3
commit r14-4066-gb9a2dce8c45b7b35f6d5811a6c1c0ee53d2af0c3
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Fri Sep 15 14:27:56 2023 +0100
libstdc++: Remove dg-options "-std=gnu++20" from 23_containers 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/23_containers/array/comparison_operators/96851.cc:
Remove dg-options -std=gnu++2a.
* testsuite/23_containers/array/comparison_operators/constexpr.cc:
Likewise.
* testsuite/23_containers/array/creation/1.cc: Likewise.
* testsuite/23_containers/array/creation/110167.cc: Likewise.
* testsuite/23_containers/array/creation/2.cc: Likewise.
* testsuite/23_containers/array/creation/3_neg.cc: Likewise.
* testsuite/23_containers/array/requirements/constexpr_fill.cc:
Likewise.
* testsuite/23_containers/array/requirements/constexpr_swap.cc:
Likewise.
* testsuite/23_containers/deque/48101-3_neg.cc: Likewise.
* testsuite/23_containers/deque/erasure.cc: Likewise.
* testsuite/23_containers/deque/modifiers/emplace/92878_92947.cc:
Likewise.
* testsuite/23_containers/deque/operators/cmp_c++20.cc:
Likewise.
* testsuite/23_containers/forward_list/48101-3_neg.cc: Likewise.
* testsuite/23_containers/forward_list/cmp_c++20.cc: Likewise.
* testsuite/23_containers/forward_list/erasure.cc: Likewise.
* testsuite/23_containers/forward_list/modifiers/92878_92947.cc:
Likewise.
* testsuite/23_containers/forward_list/operations/remove_cxx20_return.cc:
Likewise.
* testsuite/23_containers/forward_list/operations/unique_cxx20_return.cc:
Likewise.
* testsuite/23_containers/list/48101-3_neg.cc: Likewise.
* testsuite/23_containers/list/cmp_c++20.cc: Likewise.
* testsuite/23_containers/list/erasure.cc: Likewise.
* testsuite/23_containers/list/modifiers/emplace/92878_92947.cc:
Likewise.
* testsuite/23_containers/list/operations/remove_cxx20_return.cc:
Likewise.
* testsuite/23_containers/list/operations/unique_cxx20_return.cc:
Likewise.
* testsuite/23_containers/map/48101-3_neg.cc: Likewise.
* testsuite/23_containers/map/erasure.cc: Likewise.
* testsuite/23_containers/map/modifiers/emplace/92878_92947.cc:
Likewise.
* testsuite/23_containers/map/operations/contains.cc: Likewise.
* testsuite/23_containers/map/operators/cmp_c++20.cc: Likewise.
* testsuite/23_containers/multimap/48101-3_neg.cc: Likewise.
* testsuite/23_containers/multimap/modifiers/emplace/92878_92947.cc:
Likewise.
* testsuite/23_containers/multimap/operations/contains.cc:
Likewise.
* testsuite/23_containers/multimap/operators/cmp_c++20.cc:
Likewise.
* testsuite/23_containers/multiset/48101-3_neg.cc: Likewise.
* testsuite/23_containers/multiset/modifiers/emplace/92878_92947.cc:
Likewise.
* testsuite/23_containers/multiset/operations/contains.cc:
Likewise.
* testsuite/23_containers/multiset/operators/cmp_c++20.cc:
Likewise.
* testsuite/23_containers/priority_queue/92878_92947.cc:
Likewise.
* testsuite/23_containers/queue/92878_92947.cc: Likewise.
* testsuite/23_containers/queue/cmp_c++20.cc: Likewise.
* testsuite/23_containers/set/48101-3_neg.cc: Likewise.
* testsuite/23_containers/set/erasure.cc: Likewise.
* testsuite/23_containers/set/modifiers/emplace/92878_92947.cc:
Likewise.
* testsuite/23_containers/set/operations/contains.cc: Likewise.
* testsuite/23_containers/set/operators/cmp_c++20.cc: Likewise.
* testsuite/23_containers/span/1.cc: Likewise.
* testsuite/23_containers/span/101411.cc: Likewise.
* testsuite/23_containers/span/2.cc: Likewise.
* testsuite/23_containers/span/deduction.cc: Likewise.
* testsuite/23_containers/span/explicit.cc: Likewise.
* testsuite/23_containers/span/layout_compat.cc: Likewise.
* testsuite/23_containers/span/lwg3255.cc: Likewise.
* testsuite/23_containers/span/nothrow_cons.cc: Likewise.
* testsuite/23_containers/span/trivially_copyable.cc: Likewise.
* testsuite/23_containers/stack/92878_92947.cc: Likewise.
* testsuite/23_containers/stack/cmp_c++20.cc: Likewise.
* testsuite/23_containers/unordered_map/48101-3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/erasure.cc: Likewise.
* testsuite/23_containers/unordered_map/modifiers/92878_92947.cc:
Likewise.
* testsuite/23_containers/unordered_map/operations/1.cc:
Likewise.
* testsuite/23_containers/unordered_map/operations/contains.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/48101-3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/modifiers/92878_92947.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/operations/1.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/operations/contains.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/48101-3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/modifiers/92878_92947.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/operations/1.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/operations/contains.cc:
Likewise.
* testsuite/23_containers/unordered_set/48101-3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/erasure.cc: Likewise.
* testsuite/23_containers/unordered_set/modifiers/92878_92947.cc:
Likewise.
* testsuite/23_containers/unordered_set/operations/1.cc:
Likewise.
* testsuite/23_containers/unordered_set/operations/contains.cc:
Likewise.
* testsuite/23_containers/vector/48101-3_neg.cc: Likewise.
* testsuite/23_containers/vector/bool/capacity/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/bool/cmp_c++20.cc: Likewise.
* testsuite/23_containers/vector/bool/cons/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/bool/element_access/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/bool/iterator_c++20.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/assign/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/swap/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/capacity/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/cmp_c++20.cc: Likewise.
* testsuite/23_containers/vector/cons/constexpr.cc: Likewise.
* testsuite/23_containers/vector/data_access/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/element_access/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/erasure.cc: Likewise.
* testsuite/23_containers/vector/modifiers/assign/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/emplace/92878_92947.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/swap/constexpr.cc:
Likewise.
* testsuite/23_containers/vector/requirements/version.cc:
Likewise.
Diff:
---
.../testsuite/23_containers/array/comparison_operators/96851.cc | 3 +--
.../testsuite/23_containers/array/comparison_operators/constexpr.cc | 3 +--
libstdc++-v3/testsuite/23_containers/array/creation/1.cc | 3 +--
libstdc++-v3/testsuite/23_containers/array/creation/110167.cc | 1 -
libstdc++-v3/testsuite/23_containers/array/creation/2.cc | 3 +--
libstdc++-v3/testsuite/23_containers/array/creation/3_neg.cc | 4 ++--
.../testsuite/23_containers/array/requirements/constexpr_fill.cc | 3 +--
.../testsuite/23_containers/array/requirements/constexpr_swap.cc | 3 +--
libstdc++-v3/testsuite/23_containers/deque/48101-3_neg.cc | 3 +--
libstdc++-v3/testsuite/23_containers/deque/erasure.cc | 3 +--
.../testsuite/23_containers/deque/modifiers/emplace/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/deque/operators/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/forward_list/48101-3_neg.cc | 3 +--
libstdc++-v3/testsuite/23_containers/forward_list/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc | 3 +--
.../testsuite/23_containers/forward_list/modifiers/92878_92947.cc | 3 +--
.../23_containers/forward_list/operations/remove_cxx20_return.cc | 3 +--
.../23_containers/forward_list/operations/unique_cxx20_return.cc | 3 +--
libstdc++-v3/testsuite/23_containers/list/48101-3_neg.cc | 3 +--
libstdc++-v3/testsuite/23_containers/list/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/list/erasure.cc | 3 +--
.../testsuite/23_containers/list/modifiers/emplace/92878_92947.cc | 3 +--
.../testsuite/23_containers/list/operations/remove_cxx20_return.cc | 3 +--
.../testsuite/23_containers/list/operations/unique_cxx20_return.cc | 3 +--
libstdc++-v3/testsuite/23_containers/map/48101-3_neg.cc | 3 +--
libstdc++-v3/testsuite/23_containers/map/erasure.cc | 3 +--
.../testsuite/23_containers/map/modifiers/emplace/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/map/operations/contains.cc | 3 +--
libstdc++-v3/testsuite/23_containers/map/operators/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/multimap/48101-3_neg.cc | 3 +--
.../testsuite/23_containers/multimap/modifiers/emplace/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/multimap/operations/contains.cc | 3 +--
libstdc++-v3/testsuite/23_containers/multimap/operators/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/multiset/48101-3_neg.cc | 3 +--
.../testsuite/23_containers/multiset/modifiers/emplace/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/multiset/operations/contains.cc | 3 +--
libstdc++-v3/testsuite/23_containers/multiset/operators/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/priority_queue/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/queue/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/queue/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/set/48101-3_neg.cc | 3 +--
libstdc++-v3/testsuite/23_containers/set/erasure.cc | 3 +--
.../testsuite/23_containers/set/modifiers/emplace/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/set/operations/contains.cc | 3 +--
libstdc++-v3/testsuite/23_containers/set/operators/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/span/1.cc | 3 +--
libstdc++-v3/testsuite/23_containers/span/101411.cc | 1 -
libstdc++-v3/testsuite/23_containers/span/2.cc | 3 +--
libstdc++-v3/testsuite/23_containers/span/deduction.cc | 3 +--
libstdc++-v3/testsuite/23_containers/span/explicit.cc | 3 +--
libstdc++-v3/testsuite/23_containers/span/layout_compat.cc | 3 +--
libstdc++-v3/testsuite/23_containers/span/lwg3255.cc | 3 +--
libstdc++-v3/testsuite/23_containers/span/nothrow_cons.cc | 3 +--
libstdc++-v3/testsuite/23_containers/span/trivially_copyable.cc | 1 -
libstdc++-v3/testsuite/23_containers/stack/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/stack/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/unordered_map/48101-3_neg.cc | 3 +--
libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc | 3 +--
.../testsuite/23_containers/unordered_map/modifiers/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/unordered_map/operations/1.cc | 1 -
.../testsuite/23_containers/unordered_map/operations/contains.cc | 3 +--
.../testsuite/23_containers/unordered_multimap/48101-3_neg.cc | 3 +--
.../23_containers/unordered_multimap/modifiers/92878_92947.cc | 3 +--
.../testsuite/23_containers/unordered_multimap/operations/1.cc | 1 -
.../testsuite/23_containers/unordered_multimap/operations/contains.cc | 3 +--
.../testsuite/23_containers/unordered_multiset/48101-3_neg.cc | 3 +--
.../23_containers/unordered_multiset/modifiers/92878_92947.cc | 3 +--
.../testsuite/23_containers/unordered_multiset/operations/1.cc | 1 -
.../testsuite/23_containers/unordered_multiset/operations/contains.cc | 3 +--
libstdc++-v3/testsuite/23_containers/unordered_set/48101-3_neg.cc | 3 +--
libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc | 3 +--
.../testsuite/23_containers/unordered_set/modifiers/92878_92947.cc | 3 +--
libstdc++-v3/testsuite/23_containers/unordered_set/operations/1.cc | 1 -
.../testsuite/23_containers/unordered_set/operations/contains.cc | 3 +--
libstdc++-v3/testsuite/23_containers/vector/48101-3_neg.cc | 3 +--
.../testsuite/23_containers/vector/bool/capacity/constexpr.cc | 1 -
libstdc++-v3/testsuite/23_containers/vector/bool/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/vector/bool/cons/constexpr.cc | 1 -
.../testsuite/23_containers/vector/bool/element_access/constexpr.cc | 1 -
libstdc++-v3/testsuite/23_containers/vector/bool/iterator_c++20.cc | 3 +--
.../testsuite/23_containers/vector/bool/modifiers/assign/constexpr.cc | 1 -
.../testsuite/23_containers/vector/bool/modifiers/constexpr.cc | 1 -
.../testsuite/23_containers/vector/bool/modifiers/swap/constexpr.cc | 1 -
libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc | 1 -
libstdc++-v3/testsuite/23_containers/vector/cmp_c++20.cc | 3 +--
libstdc++-v3/testsuite/23_containers/vector/cons/constexpr.cc | 1 -
libstdc++-v3/testsuite/23_containers/vector/data_access/constexpr.cc | 1 -
.../testsuite/23_containers/vector/element_access/constexpr.cc | 1 -
libstdc++-v3/testsuite/23_containers/vector/erasure.cc | 3 +--
.../testsuite/23_containers/vector/modifiers/assign/constexpr.cc | 1 -
libstdc++-v3/testsuite/23_containers/vector/modifiers/constexpr.cc | 1 -
.../testsuite/23_containers/vector/modifiers/emplace/92878_92947.cc | 3 +--
.../testsuite/23_containers/vector/modifiers/swap/constexpr.cc | 1 -
libstdc++-v3/testsuite/23_containers/vector/requirements/version.cc | 1 -
94 files changed, 74 insertions(+), 167 deletions(-)
diff --git a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/96851.cc b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/96851.cc
index 2d43e07f0de..00f211a025a 100644
--- a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/96851.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/96851.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 <array>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/constexpr.cc b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/constexpr.cc
index 414c3d2a7b7..e4029bdc06b 100644
--- a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/constexpr.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/23_containers/array/creation/1.cc b/libstdc++-v3/testsuite/23_containers/array/creation/1.cc
index 33959fa02fe..9c2eedb5c15 100644
--- a/libstdc++-v3/testsuite/23_containers/array/creation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/creation/1.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/23_containers/array/creation/110167.cc b/libstdc++-v3/testsuite/23_containers/array/creation/110167.cc
index c2aecc911bd..1d02ccc7f2e 100644
--- a/libstdc++-v3/testsuite/23_containers/array/creation/110167.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/creation/110167.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// PR libstdc++/110167 - excessive compile time when optimizing std::to_array
diff --git a/libstdc++-v3/testsuite/23_containers/array/creation/2.cc b/libstdc++-v3/testsuite/23_containers/array/creation/2.cc
index 5ebded76d9e..be83073dc3d 100644
--- a/libstdc++-v3/testsuite/23_containers/array/creation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/creation/2.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/23_containers/array/creation/3_neg.cc b/libstdc++-v3/testsuite/23_containers/array/creation/3_neg.cc
index eeabdcece14..4f3a54c6377 100644
--- a/libstdc++-v3/testsuite/23_containers/array/creation/3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/creation/3_neg.cc
@@ -1,5 +1,5 @@
-// { dg-options "-std=gnu++2a -Wno-unused-result" }
-// { dg-do compile { target c++2a } }
+// { dg-options "-Wno-unused-result" }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2019-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_fill.cc b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_fill.cc
index 9e957edc05a..6acf1837a68 100644
--- a/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_fill.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_fill.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/23_containers/array/requirements/constexpr_swap.cc b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_swap.cc
index 7efd4946f8d..1db2ad94d10 100644
--- a/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_swap.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/23_containers/deque/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/48101-3_neg.cc
index e31aa08815b..98c548f3103 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/48101-3_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 <deque>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc b/libstdc++-v3/testsuite/23_containers/deque/erasure.cc
index e10402bc4c5..30885d1476a 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/erasure.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/92878_92947.cc
index ae81ee11d68..336d9a534f8 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/deque/operators/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/deque/operators/cmp_c++20.cc
index 6dff65e9d2f..2e6b9ca918c 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/operators/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/operators/cmp_c++20.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 <deque>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/48101-3_neg.cc
index 08566e68bd4..f02e5acca2b 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/48101-3_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 <forward_list>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cmp_c++20.cc
index cd778278d72..a7cf061d6cb 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cmp_c++20.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 <forward_list>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc b/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc
index 1454e831977..2a73b98a293 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/92878_92947.cc
index 886c816eb98..edf5ad59ff9 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_cxx20_return.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_cxx20_return.cc
index 698a196314c..ba526d820a4 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_cxx20_return.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_cxx20_return.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 <forward_list>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/unique_cxx20_return.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/unique_cxx20_return.cc
index 62dc08e70dc..c8c4513b240 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/unique_cxx20_return.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/unique_cxx20_return.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 <forward_list>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/48101-3_neg.cc
index 9649510539c..62e6c5e3756 100644
--- a/libstdc++-v3/testsuite/23_containers/list/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/48101-3_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 <list>
diff --git a/libstdc++-v3/testsuite/23_containers/list/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/list/cmp_c++20.cc
index 59a5b575683..01d41721edc 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cmp_c++20.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 <list>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/erasure.cc b/libstdc++-v3/testsuite/23_containers/list/erasure.cc
index de036dcd5bb..d6b06b13326 100644
--- a/libstdc++-v3/testsuite/23_containers/list/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/erasure.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/92878_92947.cc
index 208a5d985d9..7ffa8d93166 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/remove_cxx20_return.cc b/libstdc++-v3/testsuite/23_containers/list/operations/remove_cxx20_return.cc
index 9cc338b0ce1..f0ddced06a5 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operations/remove_cxx20_return.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/operations/remove_cxx20_return.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 <list>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/unique_cxx20_return.cc b/libstdc++-v3/testsuite/23_containers/list/operations/unique_cxx20_return.cc
index 23296ba376a..d2f2f7b734b 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operations/unique_cxx20_return.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/operations/unique_cxx20_return.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 <list>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/map/48101-3_neg.cc
index 0172d4173f5..9802e24be4a 100644
--- a/libstdc++-v3/testsuite/23_containers/map/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/48101-3_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 <map>
diff --git a/libstdc++-v3/testsuite/23_containers/map/erasure.cc b/libstdc++-v3/testsuite/23_containers/map/erasure.cc
index 4d5e91ae464..078d1297404 100644
--- a/libstdc++-v3/testsuite/23_containers/map/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/erasure.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/92878_92947.cc
index d6fde81356b..77d7bc7fb25 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/map/operations/contains.cc b/libstdc++-v3/testsuite/23_containers/map/operations/contains.cc
index 134adf60d0c..9ab1973aa9f 100644
--- a/libstdc++-v3/testsuite/23_containers/map/operations/contains.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/operations/contains.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 <map>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/operators/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/map/operators/cmp_c++20.cc
index 07d4e8a9cce..8ba0632249d 100644
--- a/libstdc++-v3/testsuite/23_containers/map/operators/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/operators/cmp_c++20.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 <map>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/48101-3_neg.cc
index 8f351dbe489..e37e0695923 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/48101-3_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 <map>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/92878_92947.cc
index e7412ef8e03..700bf17f264 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/operations/contains.cc b/libstdc++-v3/testsuite/23_containers/multimap/operations/contains.cc
index 906301e03f7..955b866c267 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/operations/contains.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/operations/contains.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 <map>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/operators/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/multimap/operators/cmp_c++20.cc
index 355b3dd0596..5ba8929732e 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/operators/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/operators/cmp_c++20.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 <map>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/48101-3_neg.cc
index 35a12341e0d..0aeaa238ab7 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/48101-3_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 <set>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/92878_92947.cc
index 241c640cb7e..a16d9596557 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/operations/contains.cc b/libstdc++-v3/testsuite/23_containers/multiset/operations/contains.cc
index f5144ee4228..9ba1e0dc1c5 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/operations/contains.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/operations/contains.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 <set>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/operators/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/multiset/operators/cmp_c++20.cc
index acbb5aacfa1..82d2eb13ee6 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/operators/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/operators/cmp_c++20.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 <set>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/priority_queue/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/priority_queue/92878_92947.cc
index 01f1fb49872..92d200b50e8 100644
--- a/libstdc++-v3/testsuite/23_containers/priority_queue/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/priority_queue/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/queue/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/queue/92878_92947.cc
index e2e7477b959..0b4b947b576 100644
--- a/libstdc++-v3/testsuite/23_containers/queue/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/queue/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/queue/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/queue/cmp_c++20.cc
index 643c9862959..5a04e8c90e2 100644
--- a/libstdc++-v3/testsuite/23_containers/queue/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/queue/cmp_c++20.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 <queue>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/set/48101-3_neg.cc
index 3065e703c68..a334335bed5 100644
--- a/libstdc++-v3/testsuite/23_containers/set/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/48101-3_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 <set>
diff --git a/libstdc++-v3/testsuite/23_containers/set/erasure.cc b/libstdc++-v3/testsuite/23_containers/set/erasure.cc
index eafb4b1da9d..a2bbf3ad603 100644
--- a/libstdc++-v3/testsuite/23_containers/set/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/erasure.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/92878_92947.cc
index e46188d9b36..999dcbfc766 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/set/operations/contains.cc b/libstdc++-v3/testsuite/23_containers/set/operations/contains.cc
index 79f441204c7..949882772ab 100644
--- a/libstdc++-v3/testsuite/23_containers/set/operations/contains.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/operations/contains.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 <set>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/operators/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/set/operators/cmp_c++20.cc
index 9e2e17002c3..390d8c968a8 100644
--- a/libstdc++-v3/testsuite/23_containers/set/operators/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/operators/cmp_c++20.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 <set>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/span/1.cc b/libstdc++-v3/testsuite/23_containers/span/1.cc
index 7f99f926862..40bb7a0b1f3 100644
--- a/libstdc++-v3/testsuite/23_containers/span/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/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 <span>
diff --git a/libstdc++-v3/testsuite/23_containers/span/101411.cc b/libstdc++-v3/testsuite/23_containers/span/101411.cc
index dbc13c5c75f..7d060fa6fb5 100644
--- a/libstdc++-v3/testsuite/23_containers/span/101411.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/101411.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
#include <span>
diff --git a/libstdc++-v3/testsuite/23_containers/span/2.cc b/libstdc++-v3/testsuite/23_containers/span/2.cc
index 2967687c810..533d1721a53 100644
--- a/libstdc++-v3/testsuite/23_containers/span/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/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 } }
#include <version>
diff --git a/libstdc++-v3/testsuite/23_containers/span/deduction.cc b/libstdc++-v3/testsuite/23_containers/span/deduction.cc
index 886abd3a283..162de260d1d 100644
--- a/libstdc++-v3/testsuite/23_containers/span/deduction.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/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 <span>
diff --git a/libstdc++-v3/testsuite/23_containers/span/explicit.cc b/libstdc++-v3/testsuite/23_containers/span/explicit.cc
index b0a1311f02c..7de90d683f2 100644
--- a/libstdc++-v3/testsuite/23_containers/span/explicit.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/explicit.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 <span>
diff --git a/libstdc++-v3/testsuite/23_containers/span/layout_compat.cc b/libstdc++-v3/testsuite/23_containers/span/layout_compat.cc
index 01f5eae132f..b681590dde1 100644
--- a/libstdc++-v3/testsuite/23_containers/span/layout_compat.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/layout_compat.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 <span>
#include <cstddef>
diff --git a/libstdc++-v3/testsuite/23_containers/span/lwg3255.cc b/libstdc++-v3/testsuite/23_containers/span/lwg3255.cc
index d504634e0cc..c669575444a 100644
--- a/libstdc++-v3/testsuite/23_containers/span/lwg3255.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/lwg3255.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 <span>
#include <array>
diff --git a/libstdc++-v3/testsuite/23_containers/span/nothrow_cons.cc b/libstdc++-v3/testsuite/23_containers/span/nothrow_cons.cc
index dc716db32a5..feafb9af073 100644
--- a/libstdc++-v3/testsuite/23_containers/span/nothrow_cons.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/nothrow_cons.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 <span>
diff --git a/libstdc++-v3/testsuite/23_containers/span/trivially_copyable.cc b/libstdc++-v3/testsuite/23_containers/span/trivially_copyable.cc
index e3748293555..ae4f4b64e13 100644
--- a/libstdc++-v3/testsuite/23_containers/span/trivially_copyable.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/trivially_copyable.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2021/p2251r1.pdf
diff --git a/libstdc++-v3/testsuite/23_containers/stack/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/stack/92878_92947.cc
index ab340b376b3..0a2dea80915 100644
--- a/libstdc++-v3/testsuite/23_containers/stack/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/stack/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/stack/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/stack/cmp_c++20.cc
index 912eada2350..671be8bfd8e 100644
--- a/libstdc++-v3/testsuite/23_containers/stack/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/stack/cmp_c++20.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 <stack>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/48101-3_neg.cc
index f9e042e7807..1466479e00f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/48101-3_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 <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc
index faebd31c733..696fc05afa4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/92878_92947.cc
index 9a0eb750fbc..0e48561d5e1 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/operations/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/operations/1.cc
index 835f845621b..cfeca606c55 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/operations/1.cc
@@ -15,7 +15,6 @@
// 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++20 } }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/operations/contains.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/operations/contains.cc
index dde645bdecc..547828d7b14 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/operations/contains.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/operations/contains.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 <unordered_map>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101-3_neg.cc
index 0879ccf7a1c..79ed16a5716 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/48101-3_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 <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/92878_92947.cc
index 980a3cda77d..116d5d48198 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/1.cc
index 988a66695ef..7e3867f345b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/1.cc
@@ -15,7 +15,6 @@
// 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++20 } }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/contains.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/contains.cc
index 3d9f4ecff36..ebb73425a57 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/contains.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/contains.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 <unordered_map>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101-3_neg.cc
index 01de7f5eea4..796875a8157 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/48101-3_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 <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/92878_92947.cc
index 16c28d41ab6..fb3d1746d59 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/1.cc
index 91b0f87cab8..7db4d129c52 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/1.cc
@@ -15,7 +15,6 @@
// 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++20 } }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/contains.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/contains.cc
index 44c88d5d392..9b216bb838f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/contains.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/contains.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 <unordered_set>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/48101-3_neg.cc
index 77edab6b531..3052188de21 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/48101-3_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 <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc
index 31611e31858..2384136e769 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/92878_92947.cc
index 0ee4b846397..86b9204f09a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/operations/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/operations/1.cc
index dea21df7bcb..b2f13990b56 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/operations/1.cc
@@ -15,7 +15,6 @@
// 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++20 } }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/operations/contains.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/operations/contains.cc
index 4713c5f51f1..356e809633d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/operations/contains.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/operations/contains.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 <unordered_set>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/48101-3_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/48101-3_neg.cc
index 0cf23faae19..23b72ee235a 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/48101-3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/48101-3_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 <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/constexpr.cc
index 50e420bf076..d44e9d97b46 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/cmp_c++20.cc
index 570f1681c68..66197e0aa29 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/cmp_c++20.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-xfail-if "not supported" { debug_mode } }
#include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/constexpr.cc
index 3087cbdc1b7..0e0c1e1c5ec 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/element_access/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/element_access/constexpr.cc
index e2ec21c655f..5b8ca94e78f 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/element_access/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/element_access/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/iterator_c++20.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/iterator_c++20.cc
index 811f907828a..dd0b15a778c 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/iterator_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/iterator_c++20.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 <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/assign/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/assign/constexpr.cc
index 94e318e07e4..3ad7dda88a9 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/assign/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/assign/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/constexpr.cc
index 634cc4e80c9..22a4df5e370 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/constexpr.cc
index 40ff299692a..624ff96a9e9 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc
index f102e78425b..018a4792891 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cmp_c++20.cc b/libstdc++-v3/testsuite/23_containers/vector/cmp_c++20.cc
index 52c2c59f0b1..72c5c6cd7f9 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cmp_c++20.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-xfail-if "not supported" { debug_mode } }
#include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/constexpr.cc
index e6324ad4a0a..9a784583304 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/data_access/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/data_access/constexpr.cc
index 3f69750389f..f5b601a44f4 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/data_access/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/data_access/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/element_access/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/element_access/constexpr.cc
index b9239ae1081..60c66dcc647 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/element_access/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/element_access/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc b/libstdc++-v3/testsuite/23_containers/vector/erasure.cc
index ca9259934ff..2135b6b8fb3 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/erasure.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/assign/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/assign/constexpr.cc
index 65311019718..cca20f4291c 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/assign/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/assign/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/constexpr.cc
index f0d95611ec2..766e3a7690f 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/92878_92947.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/92878_92947.cc
index eec7ff0c5de..8895dbf8822 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/92878_92947.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/92878_92947.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/constexpr.cc
index aa3436c557f..45b3986beca 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/constexpr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/version.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/version.cc
index 4c69d145dc5..50a10d217f6 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/requirements/version.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/version.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do preprocess { target c++20 } }
// { dg-require-effective-target hosted }
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-09-15 23:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-15 23:18 [gcc r14-4066] libstdc++: Remove dg-options "-std=gnu++20" from 23_containers tests Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).