Tested aarch64-linux. Pushed to trunk.
-- >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/26_numerics/accumulate/constexpr.cc: Remove
dg-options -std=gnu++2a.
* testsuite/26_numerics/accumulate/lwg2055.cc: Likewise.
* testsuite/26_numerics/adjacent_difference/constexpr.cc:
Likewise.
* testsuite/26_numerics/bit/bit.cast/105027.cc: Likewise.
* testsuite/26_numerics/bit/bit.cast/bit_cast.cc: Likewise.
* testsuite/26_numerics/bit/bit.cast/version.cc: Likewise.
* testsuite/26_numerics/bit/bit.count/countl_one.cc: Likewise.
* testsuite/26_numerics/bit/bit.pow.two/bit_ceil_neg.cc:
Likewise.
* testsuite/26_numerics/bit/bit.pow.two/bit_floor.cc: Likewise.
* testsuite/26_numerics/bit/bit.pow.two/bit_width.cc: Likewise.
* testsuite/26_numerics/bit/bit.pow.two/lwg3656.cc: Likewise.
* testsuite/26_numerics/bit/bit.rotate/rotl.cc: Likewise.
* testsuite/26_numerics/bit/bit.rotate/rotr.cc: Likewise.
* testsuite/26_numerics/bit/header-2.cc: Likewise.
* testsuite/26_numerics/bit/header.cc: Likewise.
* testsuite/26_numerics/complex/1.cc: Likewise.
* testsuite/26_numerics/complex/2.cc: Likewise.
* testsuite/26_numerics/complex/comparison_operators/more_constexpr.cc:
Likewise.
* testsuite/26_numerics/complex/operators/more_constexpr.cc:
Likewise.
* testsuite/26_numerics/complex/requirements/more_constexpr.cc:
Likewise.
* testsuite/26_numerics/complex/value_operations/more_constexpr.cc:
Likewise.
* testsuite/26_numerics/endian/1.cc: Likewise.
* testsuite/26_numerics/endian/2.cc: Likewise.
* testsuite/26_numerics/endian/3.cc: Likewise.
* testsuite/26_numerics/exclusive_scan/constexpr.cc: Likewise.
* testsuite/26_numerics/inclusive_scan/constexpr.cc: Likewise.
* testsuite/26_numerics/inner_product/constexpr.cc: Likewise.
* testsuite/26_numerics/inner_product/lwg2055.cc: Likewise.
* testsuite/26_numerics/iota/constexpr.cc: Likewise.
* testsuite/26_numerics/lerp/1.cc: Likewise.
* testsuite/26_numerics/lerp/constexpr.cc: Likewise.
* testsuite/26_numerics/lerp/version.cc: Likewise.
* testsuite/26_numerics/midpoint/floating.cc: Likewise.
* testsuite/26_numerics/midpoint/integral.cc: Likewise.
* testsuite/26_numerics/midpoint/pointer.cc: Likewise.
* testsuite/26_numerics/midpoint/pointer_neg.cc: Likewise.
* testsuite/26_numerics/midpoint/version.cc: Likewise.
* testsuite/26_numerics/numbers/1.cc: Likewise.
* testsuite/26_numerics/numbers/2.cc: Likewise.
* testsuite/26_numerics/numbers/3.cc: Likewise.
* testsuite/26_numerics/numbers/float128.cc: Likewise.
* testsuite/26_numerics/numbers/nonfloat_neg.cc: Likewise.
* testsuite/26_numerics/partial_sum/constexpr.cc: Likewise.
* testsuite/26_numerics/partial_sum/lwg2055.cc: Likewise.
* testsuite/26_numerics/random/concept.cc: Likewise.
* testsuite/26_numerics/reduce/constexpr.cc: Likewise.
* testsuite/26_numerics/slice/compare.cc: Likewise.
* testsuite/26_numerics/transform_exclusive_scan/constexpr.cc:
Likewise.
* testsuite/26_numerics/transform_inclusive_scan/constexpr.cc:
Likewise.
* testsuite/26_numerics/transform_reduce/constexpr.cc: Likewise.
---
libstdc++-v3/testsuite/26_numerics/accumulate/constexpr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/accumulate/lwg2055.cc | 3 +--
.../testsuite/26_numerics/adjacent_difference/constexpr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/bit/bit.cast/105027.cc | 1 -
libstdc++-v3/testsuite/26_numerics/bit/bit.cast/bit_cast.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/bit/bit.cast/version.cc | 3 +--
.../testsuite/26_numerics/bit/bit.count/countl_one.cc | 3 +--
.../testsuite/26_numerics/bit/bit.pow.two/bit_ceil_neg.cc | 4 ++--
.../testsuite/26_numerics/bit/bit.pow.two/bit_floor.cc | 3 +--
.../testsuite/26_numerics/bit/bit.pow.two/bit_width.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/lwg3656.cc | 1 -
libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotl.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/bit/header-2.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/bit/header.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/complex/1.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/complex/2.cc | 3 +--
.../complex/comparison_operators/more_constexpr.cc | 3 +--
.../testsuite/26_numerics/complex/operators/more_constexpr.cc | 3 +--
.../26_numerics/complex/requirements/more_constexpr.cc | 3 +--
.../26_numerics/complex/value_operations/more_constexpr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/endian/1.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/endian/2.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/endian/3.cc | 3 +--
.../testsuite/26_numerics/exclusive_scan/constexpr.cc | 3 +--
.../testsuite/26_numerics/inclusive_scan/constexpr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/inner_product/constexpr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/inner_product/lwg2055.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/iota/constexpr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/lerp/1.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/lerp/constexpr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/lerp/version.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/midpoint/floating.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/midpoint/integral.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/midpoint/pointer.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/midpoint/pointer_neg.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/midpoint/version.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/numbers/1.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/numbers/2.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/numbers/3.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/numbers/float128.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/numbers/nonfloat_neg.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/partial_sum/constexpr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/partial_sum/lwg2055.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/random/concept.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/reduce/constexpr.cc | 3 +--
libstdc++-v3/testsuite/26_numerics/slice/compare.cc | 3 +--
.../26_numerics/transform_exclusive_scan/constexpr.cc | 3 +--
.../26_numerics/transform_inclusive_scan/constexpr.cc | 3 +--
.../testsuite/26_numerics/transform_reduce/constexpr.cc | 3 +--
50 files changed, 49 insertions(+), 98 deletions(-)
diff --git a/libstdc++-v3/testsuite/26_numerics/accumulate/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/accumulate/constexpr.cc
index a6b1ec18be0..91e4f8ac369 100644
--- a/libstdc++-v3/testsuite/26_numerics/accumulate/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/accumulate/constexpr.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 <functional>
#include <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/accumulate/lwg2055.cc
b/libstdc++-v3/testsuite/26_numerics/accumulate/lwg2055.cc
index 3fd848637a3..6cdca6433a6 100644
--- a/libstdc++-v3/testsuite/26_numerics/accumulate/lwg2055.cc
+++ b/libstdc++-v3/testsuite/26_numerics/accumulate/lwg2055.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 <numeric>
#include <iterator>
diff --git
a/libstdc++-v3/testsuite/26_numerics/adjacent_difference/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/adjacent_difference/constexpr.cc
index 0d5265d0961..bc67b4baedc 100644
--- a/libstdc++-v3/testsuite/26_numerics/adjacent_difference/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/adjacent_difference/constexpr.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 <functional>
#include <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/105027.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/105027.cc
index 301d94ec575..5cba4034eda 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/105027.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/105027.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// PR libstdc++/105027 - Missing constraints on std::bit_cast
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/bit_cast.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/bit_cast.cc
index efbf4476ba6..dc7249df68a 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/bit_cast.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/bit_cast.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 <bit>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/version.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/version.cc
index 691a75863c8..296adf75682 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/version.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.cast/version.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/26_numerics/bit/bit.count/countl_one.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countl_one.cc
index c8211732662..1616e89c9b3 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countl_one.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.count/countl_one.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 <bit>
#include <limits>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_ceil_neg.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_ceil_neg.cc
index 67aa736ac8e..50e63d7fb88 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_ceil_neg.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_ceil_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a -D_GLIBCXX_ASSERTIONS" }
-// { dg-do run { target c++2a } }
+// { dg-options "-D_GLIBCXX_ASSERTIONS" }
+// { dg-do run { target c++20 } }
// { dg-xfail-run-if "__glibcxx_assert in bit_ceil should fail" { *-*-* } }
#include <bit>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_floor.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_floor.cc
index 5a879abb27e..fb343b44e91 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_floor.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_floor.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 <bit>
#include <limits>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_width.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_width.cc
index 57a1135cd39..d513f1b6d5c 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_width.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/bit_width.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 <bit>
#include <limits>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/lwg3656.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/lwg3656.cc
index 4752c3b1d33..b9b332f0bef 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/lwg3656.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.pow.two/lwg3656.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
#include <bit>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotl.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotl.cc
index 9a908f641ca..f9c7133f595 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotl.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotl.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 <bit>
#include <limits>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotr.cc
b/libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotr.cc
index d3462cbc921..48cadd71c7f 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.rotate/rotr.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 <bit>
#include <limits>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/header-2.cc
b/libstdc++-v3/testsuite/26_numerics/bit/header-2.cc
index 0059c31ff94..07d0865214e 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/header-2.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/header-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/26_numerics/bit/header.cc
b/libstdc++-v3/testsuite/26_numerics/bit/header.cc
index 00a958edf45..36207bb5149 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/header.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/header.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 <bit>
diff --git a/libstdc++-v3/testsuite/26_numerics/complex/1.cc
b/libstdc++-v3/testsuite/26_numerics/complex/1.cc
index 15379d060d5..229926cd82c 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex/1.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex/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 <complex>
diff --git a/libstdc++-v3/testsuite/26_numerics/complex/2.cc
b/libstdc++-v3/testsuite/26_numerics/complex/2.cc
index bdc2edbd5be..6276e2de405 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex/2.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex/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 } }
// { dg-require-effective-target hosted }
#include <version>
diff --git
a/libstdc++-v3/testsuite/26_numerics/complex/comparison_operators/more_constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/complex/comparison_operators/more_constexpr.cc
index 300b0c63e5c..1472507a87e 100644
---
a/libstdc++-v3/testsuite/26_numerics/complex/comparison_operators/more_constexpr.cc
+++
b/libstdc++-v3/testsuite/26_numerics/complex/comparison_operators/more_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) 2018-2023 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/26_numerics/complex/operators/more_constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/complex/operators/more_constexpr.cc
index ff2f49fbb64..320770e632b 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex/operators/more_constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex/operators/more_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) 2018-2023 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/26_numerics/complex/requirements/more_constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/complex/requirements/more_constexpr.cc
index 65533dbb8a8..40d2187fae0 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex/requirements/more_constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex/requirements/more_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) 2018-2023 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/26_numerics/complex/value_operations/more_constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/complex/value_operations/more_constexpr.cc
index 611847107e0..ff2ee697be9 100644
---
a/libstdc++-v3/testsuite/26_numerics/complex/value_operations/more_constexpr.cc
+++
b/libstdc++-v3/testsuite/26_numerics/complex/value_operations/more_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) 2018-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/26_numerics/endian/1.cc
b/libstdc++-v3/testsuite/26_numerics/endian/1.cc
index fd32140c962..1dd89dfcc45 100644
--- a/libstdc++-v3/testsuite/26_numerics/endian/1.cc
+++ b/libstdc++-v3/testsuite/26_numerics/endian/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 <bit>
diff --git a/libstdc++-v3/testsuite/26_numerics/endian/2.cc
b/libstdc++-v3/testsuite/26_numerics/endian/2.cc
index 569882cff63..2822be35563 100644
--- a/libstdc++-v3/testsuite/26_numerics/endian/2.cc
+++ b/libstdc++-v3/testsuite/26_numerics/endian/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 <bit>
diff --git a/libstdc++-v3/testsuite/26_numerics/endian/3.cc
b/libstdc++-v3/testsuite/26_numerics/endian/3.cc
index 63b4459adcd..7e02cab4086 100644
--- a/libstdc++-v3/testsuite/26_numerics/endian/3.cc
+++ b/libstdc++-v3/testsuite/26_numerics/endian/3.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/26_numerics/exclusive_scan/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/exclusive_scan/constexpr.cc
index deabdfec46b..d6609dd5012 100644
--- a/libstdc++-v3/testsuite/26_numerics/exclusive_scan/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/exclusive_scan/constexpr.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 <functional>
#include <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/inclusive_scan/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/inclusive_scan/constexpr.cc
index 2e393943884..63053ed0318 100644
--- a/libstdc++-v3/testsuite/26_numerics/inclusive_scan/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/inclusive_scan/constexpr.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 <functional>
#include <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/inner_product/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/inner_product/constexpr.cc
index 55ed5fd82ba..1cc380347ae 100644
--- a/libstdc++-v3/testsuite/26_numerics/inner_product/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/inner_product/constexpr.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 <functional>
#include <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/inner_product/lwg2055.cc
b/libstdc++-v3/testsuite/26_numerics/inner_product/lwg2055.cc
index 647583c160e..66953c4339f 100644
--- a/libstdc++-v3/testsuite/26_numerics/inner_product/lwg2055.cc
+++ b/libstdc++-v3/testsuite/26_numerics/inner_product/lwg2055.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 <numeric>
#include <iterator>
diff --git a/libstdc++-v3/testsuite/26_numerics/iota/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/iota/constexpr.cc
index 8b7ea23039e..089c4fbae71 100644
--- a/libstdc++-v3/testsuite/26_numerics/iota/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/iota/constexpr.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 <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/lerp/1.cc
b/libstdc++-v3/testsuite/26_numerics/lerp/1.cc
index 328f5090fcb..65b715437f5 100644
--- a/libstdc++-v3/testsuite/26_numerics/lerp/1.cc
+++ b/libstdc++-v3/testsuite/26_numerics/lerp/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 run { target c++2a } }
+// { dg-do run { target c++20 } }
#include <cmath>
diff --git a/libstdc++-v3/testsuite/26_numerics/lerp/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/lerp/constexpr.cc
index f1ab42b5a42..10956a55ba3 100644
--- a/libstdc++-v3/testsuite/26_numerics/lerp/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/lerp/constexpr.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
#include <cmath>
diff --git a/libstdc++-v3/testsuite/26_numerics/lerp/version.cc
b/libstdc++-v3/testsuite/26_numerics/lerp/version.cc
index c19ead7586d..63206ba8e3f 100644
--- a/libstdc++-v3/testsuite/26_numerics/lerp/version.cc
+++ b/libstdc++-v3/testsuite/26_numerics/lerp/version.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do preprocess { target c++2a } }
+// { dg-do preprocess { target c++20 } }
// { dg-require-effective-target hosted }
#include <version>
diff --git a/libstdc++-v3/testsuite/26_numerics/midpoint/floating.cc
b/libstdc++-v3/testsuite/26_numerics/midpoint/floating.cc
index 7ccf317118b..32985db0220 100644
--- a/libstdc++-v3/testsuite/26_numerics/midpoint/floating.cc
+++ b/libstdc++-v3/testsuite/26_numerics/midpoint/floating.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 <numeric>
#include <limits>
diff --git a/libstdc++-v3/testsuite/26_numerics/midpoint/integral.cc
b/libstdc++-v3/testsuite/26_numerics/midpoint/integral.cc
index 0157db5bc21..0f8a16e656e 100644
--- a/libstdc++-v3/testsuite/26_numerics/midpoint/integral.cc
+++ b/libstdc++-v3/testsuite/26_numerics/midpoint/integral.cc
@@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
#include <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/midpoint/pointer.cc
b/libstdc++-v3/testsuite/26_numerics/midpoint/pointer.cc
index 6d70cfe77c7..c11968534bb 100644
--- a/libstdc++-v3/testsuite/26_numerics/midpoint/pointer.cc
+++ b/libstdc++-v3/testsuite/26_numerics/midpoint/pointer.cc
@@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
#include <numeric>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/26_numerics/midpoint/pointer_neg.cc
b/libstdc++-v3/testsuite/26_numerics/midpoint/pointer_neg.cc
index 8fa8d53a827..1935ed4effe 100644
--- a/libstdc++-v3/testsuite/26_numerics/midpoint/pointer_neg.cc
+++ b/libstdc++-v3/testsuite/26_numerics/midpoint/pointer_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 <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/midpoint/version.cc
b/libstdc++-v3/testsuite/26_numerics/midpoint/version.cc
index c19ead7586d..63206ba8e3f 100644
--- a/libstdc++-v3/testsuite/26_numerics/midpoint/version.cc
+++ b/libstdc++-v3/testsuite/26_numerics/midpoint/version.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do preprocess { target c++2a } }
+// { dg-do preprocess { target c++20 } }
// { dg-require-effective-target hosted }
#include <version>
diff --git a/libstdc++-v3/testsuite/26_numerics/numbers/1.cc
b/libstdc++-v3/testsuite/26_numerics/numbers/1.cc
index 83714520b9e..f41551c2148 100644
--- a/libstdc++-v3/testsuite/26_numerics/numbers/1.cc
+++ b/libstdc++-v3/testsuite/26_numerics/numbers/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 <numbers>
diff --git a/libstdc++-v3/testsuite/26_numerics/numbers/2.cc
b/libstdc++-v3/testsuite/26_numerics/numbers/2.cc
index e35bda39bb0..d9e791e2843 100644
--- a/libstdc++-v3/testsuite/26_numerics/numbers/2.cc
+++ b/libstdc++-v3/testsuite/26_numerics/numbers/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/26_numerics/numbers/3.cc
b/libstdc++-v3/testsuite/26_numerics/numbers/3.cc
index ff0fb1a0127..c7e32c9c7d3 100644
--- a/libstdc++-v3/testsuite/26_numerics/numbers/3.cc
+++ b/libstdc++-v3/testsuite/26_numerics/numbers/3.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 <numbers>
diff --git a/libstdc++-v3/testsuite/26_numerics/numbers/float128.cc
b/libstdc++-v3/testsuite/26_numerics/numbers/float128.cc
index ff50cf420fd..a5983b74fe8 100644
--- a/libstdc++-v3/testsuite/26_numerics/numbers/float128.cc
+++ b/libstdc++-v3/testsuite/26_numerics/numbers/float128.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 <numbers>
diff --git a/libstdc++-v3/testsuite/26_numerics/numbers/nonfloat_neg.cc
b/libstdc++-v3/testsuite/26_numerics/numbers/nonfloat_neg.cc
index b7f1afc0ebe..35e2ad8e728 100644
--- a/libstdc++-v3/testsuite/26_numerics/numbers/nonfloat_neg.cc
+++ b/libstdc++-v3/testsuite/26_numerics/numbers/nonfloat_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 <numbers>
diff --git a/libstdc++-v3/testsuite/26_numerics/partial_sum/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/partial_sum/constexpr.cc
index 9737f9667fb..782f0743c55 100644
--- a/libstdc++-v3/testsuite/26_numerics/partial_sum/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/partial_sum/constexpr.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 <functional>
#include <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/partial_sum/lwg2055.cc
b/libstdc++-v3/testsuite/26_numerics/partial_sum/lwg2055.cc
index 627371bd875..c1fd6d53b04 100644
--- a/libstdc++-v3/testsuite/26_numerics/partial_sum/lwg2055.cc
+++ b/libstdc++-v3/testsuite/26_numerics/partial_sum/lwg2055.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 <numeric>
#include <iterator>
diff --git a/libstdc++-v3/testsuite/26_numerics/random/concept.cc
b/libstdc++-v3/testsuite/26_numerics/random/concept.cc
index fcc1614ca18..0b37290fd46 100644
--- a/libstdc++-v3/testsuite/26_numerics/random/concept.cc
+++ b/libstdc++-v3/testsuite/26_numerics/random/concept.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-cstdint "" }
#include <random>
diff --git a/libstdc++-v3/testsuite/26_numerics/reduce/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/reduce/constexpr.cc
index eb89d7309d1..89eda705c73 100644
--- a/libstdc++-v3/testsuite/26_numerics/reduce/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/reduce/constexpr.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 <functional>
#include <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/slice/compare.cc
b/libstdc++-v3/testsuite/26_numerics/slice/compare.cc
index c239896d83d..2c269b2b720 100644
--- a/libstdc++-v3/testsuite/26_numerics/slice/compare.cc
+++ b/libstdc++-v3/testsuite/26_numerics/slice/compare.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 <valarray>
#include <testsuite_hooks.h>
diff --git
a/libstdc++-v3/testsuite/26_numerics/transform_exclusive_scan/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/transform_exclusive_scan/constexpr.cc
index f409a330bb3..9ca770a85fc 100644
--- a/libstdc++-v3/testsuite/26_numerics/transform_exclusive_scan/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/transform_exclusive_scan/constexpr.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 <functional>
#include <numeric>
diff --git
a/libstdc++-v3/testsuite/26_numerics/transform_inclusive_scan/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/transform_inclusive_scan/constexpr.cc
index 8f3d527e5da..ff3639fdc22 100644
--- a/libstdc++-v3/testsuite/26_numerics/transform_inclusive_scan/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/transform_inclusive_scan/constexpr.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 <functional>
#include <numeric>
diff --git a/libstdc++-v3/testsuite/26_numerics/transform_reduce/constexpr.cc
b/libstdc++-v3/testsuite/26_numerics/transform_reduce/constexpr.cc
index 5eeeec94607..e331f53a590 100644
--- a/libstdc++-v3/testsuite/26_numerics/transform_reduce/constexpr.cc
+++ b/libstdc++-v3/testsuite/26_numerics/transform_reduce/constexpr.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 <functional>
#include <numeric>
--
2.41.0
