libstdc++: Remove dg-options "-std=gnu++20" from 21_strings 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/21_strings/basic_string/cons/char/105995.cc: Remove
	dg-options -std=gnu++20.
	* testsuite/21_strings/basic_string/cons/char/constexpr.cc:
	Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc:
	Likewise.
	* testsuite/21_strings/basic_string/erasure.cc: Likewise.
	* testsuite/21_strings/basic_string/hash/hash_char8_t.cc:
	Likewise.
	* testsuite/21_strings/basic_string/literals/constexpr.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/constexpr.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/ends_with/char.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/starts_with/char.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operators/char/cmp_c++20.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/cons/char/range.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/ends_with/char.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/starts_with/char.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operators/char/cmp_c++20.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/requirements/constexpr_iter.cc:
	Likewise.
	* testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc:
	Likewise.

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc
index 4764ceff72a284262903ef532452eebfeb6715cb..ad3ec1f41ff6d93c0e712897440a8dea3fbbf6c2 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 // { dg-require-effective-target cxx11_abi }
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/constexpr.cc
index 5a1c0e6a05dae1a53e7c04fdbfbc73fcd1194ab1..8c60708a3d3a347e3ca220d2acf354264811818f 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 // { dg-require-effective-target cxx11_abi }
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc
index 260f8b3947e8c78e6a137b6aef6e05306f7d7195..40cea53b590785b241c2ad2ec0c889057c708634 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 // { dg-require-effective-target cxx11_abi }
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc b/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc
index d12ce9e96953ac7bea1f8d26f8eeb5aaad164fda..b85496a16f10154abd6653505678f9d1c241f7d5 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/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/21_strings/basic_string/hash/hash_char8_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string/hash/hash_char8_t.cc
index c5420448db9665a89aa7c4473f8adf14d303e450..ae2dc2cb3c8e3917a279a5d3428afbdfbc172393 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/hash/hash_char8_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/hash/hash_char8_t.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 <string>
 #include <memory_resource>

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/literals/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/literals/constexpr.cc
index f1ccb5dc166dd92e20221d73c1267d5e77befc15..c2b54f15fc425873200d35cae9d617a5684c8f85 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/literals/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/literals/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 // { dg-require-effective-target cxx11_abi }
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc
index 77fe59bb785860fdea3afbc7b50857fb78dd81f6..0e28a6d448725fdf7d265087ac324dc8c72c9614 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 // { dg-require-effective-target cxx11_abi }
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc
index 6b3a304512c3bbd7de61d50382c09ed25da5ffbf..09d09af7164b7949715905849775c3bf823c792b 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr-wchar_t.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 // { dg-require-effective-target cxx11_abi }
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc
index 1137a3e9931640084db9bf295a0f77f365ab907d..de774bbbc9a6635c863833ad5a753b907a363240 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/swap/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 // { dg-require-effective-target cxx11_abi }
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc
index f1e4ea3c5d094ce26f36a6c1cca79240452a85b8..1fd34552c1e35660c0aca5cea9c58a2bfbe7be35 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/char.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/21_strings/basic_string/operations/ends_with/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc
index ba77f0124d06ef8b370435df5d887a4c728fc206..7e720be12782add1261d9d111c3e43832241cfd0 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
 // { dg-do compile { target c++20 } }
 
 #include <testsuite_string.h>

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc
index e8fef749fb022fba3f5fd85e985a133f4f392f39..30c446f8602b470860477ca3f72067633fdc4b0c 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/ends_with/wchar_t.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/21_strings/basic_string/operations/starts_with/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.cc
index c8357d20374ffb03199311568ec00be14eb42f7d..f9e263b476e13f8dae1ae1a7c2df6936524399b4 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/char.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/21_strings/basic_string/operations/starts_with/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc
index a023d9ec227082e8bccc31b7e6fdc607d7623c12..fe8c6a7702cbfff242db098140113a603b6c9c96 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
 // { dg-do compile { target c++20 } }
 
 #include <testsuite_string.h>

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc
index aaef4cb31b82001017cc94b5ebbb7a2de5872edb..ee685b95b9c68482e143f99cf16ccf21129435e1 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/starts_with/wchar_t.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/21_strings/basic_string/operators/char/cmp_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/cmp_c++20.cc
index b78195f5479e0876c600127b716cb5311505615b..fe69635bdaee41a41a71fc54a8365e733a8c6840 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/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 } }
 
 // C++20 21.3.3.2 Non-member comparison functions [string.cmp]
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc
index ed9f61e059d265a9eb7e012b971a53f0cf4a7c38..4ae4d3d432482fce03109208013f59d2f5558243 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/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 } }
 
 // C++20 21.3.3.2 Non-member comparison functions [string.cmp]
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range.cc
index 568b8a0a3e4d6e50e2eed2f2264c2280e6b7323b..d28b235a04fe20167eea361a2d174b236d2323ac 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range.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 <string_view>

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc
index 309e919d726b4932c731d17c091f70c988a57e58..b91fea03c626faa5d327fc99c053227adea831e4 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/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 <string_view>
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc
index adfbf0a8ff38ba0d5ce35d7434be2d38abdd84b6..0f692d7a32245c873dcd8572c56d7cc4fdcceb43 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/constexpr.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/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 <string_view>
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc
index e5ce2f0b52cd1855f343ffe2b28ee99a593e76db..615336363f02f08448d563f570e603a90f52af53 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/char.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/21_strings/basic_string_view/operations/ends_with/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc
index 50437bb448abe2b535f269c7303d850c002db2ba..7521b621855ef5dc96df091f3a09d0647a57ef15 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
 // { dg-do compile { target c++20 } }
 
 #include <string_view>

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc
index 6984a7f1d73a9991bb4786726e11c5c48668056a..9e83c85f6a62873e9755c6cd1c9fca284b75ff20 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/ends_with/wchar_t.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/21_strings/basic_string_view/operations/starts_with/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.cc
index ec0bc0532c8d1300e8337b285b60dbd85a06f288..4f2429014a04c76df13ae847d5d8b0c26f24d091 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/char.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/21_strings/basic_string_view/operations/starts_with/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc
index fedba28afa3efa344ebc314cc10ae04b4ff311d4..dfdf22554558ffc42e97c3705fa48cb99536cda0 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
 // { dg-do compile { target c++20 } }
 
 #include <string_view>

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc
index 8535d7a7966b536854048b1a8d19ef1b627e3ed9..1d8c6431b4e414de36f54c89648a8478cc25c246 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/starts_with/wchar_t.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/21_strings/basic_string_view/operators/char/cmp_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/cmp_c++20.cc
index 0ce700ce0b79777fb18bd704d254f9ac0452585d..537505b113ac59051e15923239fb3ab83e9d76cd 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/cmp_c++20.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/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.cc
index 9911b69d9a465317fcda406d5539c3b1c46aad57..50df0ace53c930fb48fdef069b03512e5950fa9f 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/cmp_c++20.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/21_strings/basic_string_view/requirements/constexpr_iter.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/constexpr_iter.cc
index 249e48de5377b4c8ce8878eccab127bf54d01bd8..954c7eea6da98eebf04d72871a93b4a75d66813d 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/constexpr_iter.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/requirements/constexpr_iter.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/21_strings/char_traits/requirements/constexpr_functions_c++20.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc
index bdc0b0a210385e1697565d56f386b0c543868d1c..805b84dea588b11a8c6835340ea49a539fc90cd8 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 
 // Copyright (C) 2017-2023 Free Software Foundation, Inc.