aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2023-09-01 21:28:05 +0100
committerJonathan Wakely <jwakely@redhat.com>2023-09-15 21:57:40 +0100
commit7810fb3a142bed6da9eca8fde114629023fc5c4e (patch)
tree1b6c42e731e76c841f3f11b6b471a0260f1ed1a3 /libstdc++-v3/testsuite
parent5188b4028db26eaaf6f77c3c5e13e615f1029875 (diff)
downloadgcc-7810fb3a142bed6da9eca8fde114629023fc5c4e.zip
gcc-7810fb3a142bed6da9eca8fde114629023fc5c4e.tar.gz
gcc-7810fb3a142bed6da9eca8fde114629023fc5c4e.tar.bz2
libstdc++: Remove dg-options "-std=gnu++23" from remaining tests
The testsuite will automatically select C++23 for these tests now, and removing the hardcoded -std option allows them to be tested for C++26 as well. libstdc++-v3/ChangeLog: * testsuite/18_support/headers/limits/synopsis_cxx23.cc: Remove dg-options. * testsuite/18_support/headers/stdfloat/types_std.cc: Likewise. * testsuite/18_support/type_info/constexpr.cc: Likewise. * testsuite/19_diagnostics/stacktrace/current.cc: Likewise. * testsuite/19_diagnostics/stacktrace/entry.cc: Likewise. * testsuite/19_diagnostics/stacktrace/stacktrace.cc: Likewise. * testsuite/19_diagnostics/stacktrace/synopsis.cc: Likewise. * testsuite/19_diagnostics/stacktrace/version.cc: Likewise. * testsuite/20_util/aligned_storage/deprecated-2b.cc: Likewise. * testsuite/20_util/aligned_union/deprecated-2b.cc: Likewise. * testsuite/20_util/bitset/access/constexpr.cc: Likewise. * testsuite/20_util/bitset/cons/constexpr_c++23.cc: Likewise. * testsuite/20_util/bitset/count/constexpr.cc: Likewise. * testsuite/20_util/bitset/ext/constexpr.cc: Likewise. * testsuite/20_util/bitset/operations/constexpr_c++23.cc: Likewise. * testsuite/20_util/bitset/version.cc: Likewise. * testsuite/20_util/from_chars/8.cc: Likewise. * testsuite/20_util/from_chars/constexpr.cc: Likewise. * testsuite/20_util/function/cons/deduction_c++23.cc: Likewise. * testsuite/20_util/function_objects/invoke/4.cc: Likewise. * testsuite/20_util/function_objects/invoke/dangling_ref.cc: Likewise. * testsuite/20_util/is_scoped_enum/value.cc: Likewise. * testsuite/20_util/is_scoped_enum/version.cc: Likewise. * testsuite/20_util/move_only_function/call.cc: Likewise. * testsuite/20_util/move_only_function/cons.cc: Likewise. * testsuite/20_util/move_only_function/move.cc: Likewise. * testsuite/20_util/move_only_function/version.cc: Likewise. * testsuite/20_util/optional/monadic/and_then.cc: Likewise. * testsuite/20_util/optional/monadic/or_else.cc: Likewise. * testsuite/20_util/optional/monadic/or_else_neg.cc: Likewise. * testsuite/20_util/optional/monadic/pr109242.cc: Likewise. * testsuite/20_util/optional/monadic/transform.cc: Likewise. * testsuite/20_util/pair/p2321r2.cc: Likewise. * testsuite/20_util/reference_from_temporary/value.cc: Likewise. * testsuite/20_util/reference_from_temporary/value2.cc: Likewise. * testsuite/20_util/reference_from_temporary/version.cc: Likewise. * testsuite/20_util/to_chars/constexpr.cc: Likewise. * testsuite/20_util/to_chars/float128_c++23.cc: Likewise. * testsuite/20_util/to_chars/float16_c++23.cc: Likewise. * testsuite/20_util/to_chars/version.cc: Likewise. * testsuite/20_util/to_underlying/1.cc: Likewise. * testsuite/20_util/to_underlying/version.cc: Likewise. * testsuite/20_util/tuple/p2321r2.cc: Likewise. * testsuite/20_util/unique_ptr/assign/constexpr.cc: Likewise. * testsuite/20_util/unique_ptr/comparison/constexpr.cc: Likewise. * testsuite/20_util/unique_ptr/cons/constexpr_c++20.cc: Likewise. * testsuite/20_util/unique_ptr/creation/constexpr.cc: Likewise. * testsuite/20_util/unique_ptr/modifiers/constexpr.cc: Likewise. * testsuite/20_util/unique_ptr/specialized_algorithms/constexpr.cc: Likewise. * testsuite/20_util/unreachable/1.cc: Likewise. * testsuite/20_util/unreachable/version.cc: Likewise. * testsuite/20_util/uses_allocator/lwg3677.cc: Likewise. * testsuite/21_strings/basic_string/capacity/char/resize_and_overwrite.cc: Likewise. * testsuite/21_strings/basic_string/operations/contains/char.cc: Likewise. * testsuite/21_strings/basic_string/operations/contains/nonnull.cc: Likewise. * testsuite/21_strings/basic_string/operations/contains/wchar_t.cc: Likewise. * testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc: Likewise. * testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/contains/char.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/contains/char/2.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/contains/nonnull.cc: Likewise. * testsuite/21_strings/basic_string_view/operations/contains/wchar_t.cc: Likewise. * testsuite/23_containers/queue/cons_from_iters.cc: Likewise. * testsuite/23_containers/stack/cons_from_iters.cc: Likewise. * testsuite/23_containers/vector/bool/element_access/1.cc: Likewise. * testsuite/24_iterators/const_iterator/1.cc: Likewise. * testsuite/25_algorithms/contains/1.cc: Likewise. * testsuite/25_algorithms/contains_subrange/1.cc: Likewise. * testsuite/25_algorithms/find_last/1.cc: Likewise. * testsuite/25_algorithms/find_last_if/1.cc: Likewise. * testsuite/25_algorithms/find_last_if_not/1.cc: Likewise. * testsuite/25_algorithms/fold_left/1.cc: Likewise. * testsuite/25_algorithms/fold_right/1.cc: Likewise. * testsuite/25_algorithms/iota/1.cc: Likewise. * testsuite/26_numerics/bit/bit.byteswap/byteswap.cc: Likewise. * testsuite/26_numerics/bit/bit.byteswap/version.cc: Likewise. * testsuite/26_numerics/complex/ext_c++23.cc: Likewise. * testsuite/26_numerics/headers/cmath/c99_classification_macros_c++23.cc: Likewise. * testsuite/26_numerics/headers/cmath/constexpr_std_c++23.cc: Likewise. * testsuite/26_numerics/headers/cmath/functions_std_c++23.cc: Likewise. * testsuite/26_numerics/headers/cmath/nextafter_c++23.cc: Likewise. * testsuite/26_numerics/numbers/4.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/char/volatile_ptr.cc: Likewise. * testsuite/27_io/filesystem/path/native/conv_c++23.cc: Likewise. * testsuite/27_io/spanstream/1.cc: Likewise. * testsuite/27_io/spanstream/2.cc: Likewise. * testsuite/27_io/spanstream/version.cc: Likewise. * testsuite/29_atomics/atomic_float/requirements_cxx23.cc: Likewise. * testsuite/29_atomics/headers/stdatomic.h/c_compat.cc: Likewise. * testsuite/29_atomics/headers/stdatomic.h/version.cc: Likewise. * testsuite/30_threads/packaged_task/cons/deduction_c++23.cc: Likewise. * testsuite/experimental/filesystem/path/native/conv_c++23.cc: Likewise. * testsuite/std/ranges/adaptors/adjacent/1.cc: Likewise. * testsuite/std/ranges/adaptors/adjacent_transform/1.cc: Likewise. * testsuite/std/ranges/adaptors/as_const/1.cc: Likewise. * testsuite/std/ranges/adaptors/as_rvalue/1.cc: Likewise. * testsuite/std/ranges/adaptors/chunk/1.cc: Likewise. * testsuite/std/ranges/adaptors/chunk_by/1.cc: Likewise. * testsuite/std/ranges/adaptors/enumerate/1.cc: Likewise. * testsuite/std/ranges/adaptors/join_with/1.cc: Likewise. * testsuite/std/ranges/adaptors/lwg3715.cc: Likewise. * testsuite/std/ranges/adaptors/slide/1.cc: Likewise. * testsuite/std/ranges/adaptors/stride/1.cc: Likewise. * testsuite/std/ranges/cartesian_product/1.cc: Likewise. * testsuite/std/ranges/range_adaptor_closure.cc: Likewise. * testsuite/std/ranges/repeat/1.cc: Likewise. * testsuite/std/ranges/version_c++23.cc: Likewise. * testsuite/std/ranges/zip/1.cc: Likewise. * testsuite/std/ranges/zip_transform/1.cc: Likewise.
Diffstat (limited to 'libstdc++-v3/testsuite')
-rw-r--r--libstdc++-v3/testsuite/18_support/headers/limits/synopsis_cxx23.cc1
-rw-r--r--libstdc++-v3/testsuite/18_support/headers/stdfloat/types_std.cc1
-rw-r--r--libstdc++-v3/testsuite/18_support/type_info/constexpr.cc2
-rw-r--r--libstdc++-v3/testsuite/19_diagnostics/stacktrace/current.cc2
-rw-r--r--libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc2
-rw-r--r--libstdc++-v3/testsuite/19_diagnostics/stacktrace/stacktrace.cc2
-rw-r--r--libstdc++-v3/testsuite/19_diagnostics/stacktrace/synopsis.cc1
-rw-r--r--libstdc++-v3/testsuite/19_diagnostics/stacktrace/version.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/aligned_storage/deprecated-2b.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/aligned_union/deprecated-2b.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/bitset/access/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/bitset/cons/constexpr_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/bitset/count/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/bitset/ext/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/bitset/operations/constexpr_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/bitset/version.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/from_chars/8.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/function/cons/deduction_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/function_objects/invoke/4.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/function_objects/invoke/dangling_ref.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/is_scoped_enum/value.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/is_scoped_enum/version.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/move_only_function/call.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/move_only_function/cons.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/move_only_function/move.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/move_only_function/version.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/optional/monadic/or_else.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/optional/monadic/or_else_neg.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/optional/monadic/pr109242.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/pair/p2321r2.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/reference_from_temporary/value.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/reference_from_temporary/value2.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/reference_from_temporary/version.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/to_chars/float128_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/to_chars/float16_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/to_chars/version.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/to_underlying/1.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/to_underlying/version.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/unique_ptr/assign/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/unique_ptr/comparison/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/unique_ptr/cons/constexpr_c++20.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/unique_ptr/creation/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/constexpr.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/unreachable/1.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/unreachable/version.cc1
-rw-r--r--libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/resize_and_overwrite.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/char.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/nonnull.cc2
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/wchar_t.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/2.cc1
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/nonnull.cc2
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/wchar_t.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/vector/bool/element_access/1.cc1
-rw-r--r--libstdc++-v3/testsuite/24_iterators/const_iterator/1.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/contains/1.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/contains_subrange/1.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/find_last/1.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/find_last_if/1.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/find_last_if_not/1.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/fold_right/1.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/iota/1.cc1
-rw-r--r--libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/byteswap.cc1
-rw-r--r--libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/version.cc1
-rw-r--r--libstdc++-v3/testsuite/26_numerics/complex/ext_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/26_numerics/headers/cmath/constexpr_std_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/26_numerics/headers/cmath/functions_std_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/26_numerics/headers/cmath/nextafter_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/26_numerics/numbers/4.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/volatile_ptr.cc2
-rw-r--r--libstdc++-v3/testsuite/27_io/filesystem/path/native/conv_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/spanstream/1.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/spanstream/2.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/spanstream/version.cc1
-rw-r--r--libstdc++-v3/testsuite/29_atomics/atomic_float/requirements_cxx23.cc1
-rw-r--r--libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/c_compat.cc1
-rw-r--r--libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/version.cc1
-rw-r--r--libstdc++-v3/testsuite/30_threads/packaged_task/cons/deduction_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/experimental/filesystem/path/native/conv_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/adjacent_transform/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/as_const/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/enumerate/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/repeat/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/version_c++23.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/zip/1.cc1
-rw-r--r--libstdc++-v3/testsuite/std/ranges/zip_transform/1.cc1
109 files changed, 7 insertions, 109 deletions
diff --git a/libstdc++-v3/testsuite/18_support/headers/limits/synopsis_cxx23.cc b/libstdc++-v3/testsuite/18_support/headers/limits/synopsis_cxx23.cc
index 355eb2b..2d9ea05 100644
--- a/libstdc++-v3/testsuite/18_support/headers/limits/synopsis_cxx23.cc
+++ b/libstdc++-v3/testsuite/18_support/headers/limits/synopsis_cxx23.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++2b" }
// { dg-do compile { target c++23 } }
// { dg-require-normal-namespace "" }
diff --git a/libstdc++-v3/testsuite/18_support/headers/stdfloat/types_std.cc b/libstdc++-v3/testsuite/18_support/headers/stdfloat/types_std.cc
index 8a12abf..eb4d5ec 100644
--- a/libstdc++-v3/testsuite/18_support/headers/stdfloat/types_std.cc
+++ b/libstdc++-v3/testsuite/18_support/headers/stdfloat/types_std.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++2b" }
// { dg-do compile { target c++23 } }
// Copyright (C) 2022-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/18_support/type_info/constexpr.cc b/libstdc++-v3/testsuite/18_support/type_info/constexpr.cc
index 6fb67b4..9390aa4 100644
--- a/libstdc++-v3/testsuite/18_support/type_info/constexpr.cc
+++ b/libstdc++-v3/testsuite/18_support/type_info/constexpr.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++23 -frtti" }
+// { dg-options "-frtti" }
// { dg-do compile { target c++23 } }
// { dg-additional-options "-fdelete-null-pointer-checks" }
diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/current.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/current.cc
index f6c860f..a27836d 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/current.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/current.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++23 -lstdc++exp" }
+// { dg-options "-lstdc++exp" }
// { dg-do run { target c++23 } }
// { dg-require-effective-target stacktrace }
diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc
index f040695..ab016d56 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++23 -lstdc++exp" }
+// { dg-options "-lstdc++exp" }
// { dg-do run { target c++23 } }
// { dg-require-effective-target stacktrace }
diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/stacktrace.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/stacktrace.cc
index 0a358b7..5dfa769 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/stacktrace.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/stacktrace.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++23 -lstdc++exp" }
+// { dg-options "-lstdc++exp" }
// { dg-do run { target c++23 } }
// { dg-require-effective-target stacktrace }
diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/synopsis.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/synopsis.cc
index 21c94f3..5e32527 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/synopsis.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/synopsis.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// { dg-require-effective-target stacktrace }
// { dg-require-normal-namespace "" }
diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/version.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/version.cc
index d59a069..ecfaf41 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/version.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/version.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do preprocess { target c++23 } }
// { dg-require-effective-target stacktrace }
diff --git a/libstdc++-v3/testsuite/20_util/aligned_storage/deprecated-2b.cc b/libstdc++-v3/testsuite/20_util/aligned_storage/deprecated-2b.cc
index a0e338a..fb6800b 100644
--- a/libstdc++-v3/testsuite/20_util/aligned_storage/deprecated-2b.cc
+++ b/libstdc++-v3/testsuite/20_util/aligned_storage/deprecated-2b.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <type_traits>
diff --git a/libstdc++-v3/testsuite/20_util/aligned_union/deprecated-2b.cc b/libstdc++-v3/testsuite/20_util/aligned_union/deprecated-2b.cc
index fa00a92..18c71d9 100644
--- a/libstdc++-v3/testsuite/20_util/aligned_union/deprecated-2b.cc
+++ b/libstdc++-v3/testsuite/20_util/aligned_union/deprecated-2b.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <type_traits>
diff --git a/libstdc++-v3/testsuite/20_util/bitset/access/constexpr.cc b/libstdc++-v3/testsuite/20_util/bitset/access/constexpr.cc
index 53bb07f..6cf08b5 100644
--- a/libstdc++-v3/testsuite/20_util/bitset/access/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/bitset/access/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <bitset>
diff --git a/libstdc++-v3/testsuite/20_util/bitset/cons/constexpr_c++23.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/constexpr_c++23.cc
index d308c2b..871d17d 100644
--- a/libstdc++-v3/testsuite/20_util/bitset/cons/constexpr_c++23.cc
+++ b/libstdc++-v3/testsuite/20_util/bitset/cons/constexpr_c++23.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// This test relies on std::string.
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/bitset/count/constexpr.cc b/libstdc++-v3/testsuite/20_util/bitset/count/constexpr.cc
index 98f8e22..0832fcf 100644
--- a/libstdc++-v3/testsuite/20_util/bitset/count/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/bitset/count/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <bitset>
diff --git a/libstdc++-v3/testsuite/20_util/bitset/ext/constexpr.cc b/libstdc++-v3/testsuite/20_util/bitset/ext/constexpr.cc
index 4bacefa..5370902 100644
--- a/libstdc++-v3/testsuite/20_util/bitset/ext/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/bitset/ext/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// This test relies on std::string.
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/bitset/operations/constexpr_c++23.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/constexpr_c++23.cc
index c594dd6..5ca209d 100644
--- a/libstdc++-v3/testsuite/20_util/bitset/operations/constexpr_c++23.cc
+++ b/libstdc++-v3/testsuite/20_util/bitset/operations/constexpr_c++23.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <bitset>
diff --git a/libstdc++-v3/testsuite/20_util/bitset/version.cc b/libstdc++-v3/testsuite/20_util/bitset/version.cc
index 791ec43..1badb29 100644
--- a/libstdc++-v3/testsuite/20_util/bitset/version.cc
+++ b/libstdc++-v3/testsuite/20_util/bitset/version.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do preprocess { target c++23 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/from_chars/8.cc b/libstdc++-v3/testsuite/20_util/from_chars/8.cc
index d37460a..0b6d400 100644
--- a/libstdc++-v3/testsuite/20_util/from_chars/8.cc
+++ b/libstdc++-v3/testsuite/20_util/from_chars/8.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do run { target c++23 } }
// { dg-add-options ieee }
diff --git a/libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc b/libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc
index 6e14694..1a19e70 100644
--- a/libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <charconv>
diff --git a/libstdc++-v3/testsuite/20_util/function/cons/deduction_c++23.cc b/libstdc++-v3/testsuite/20_util/function/cons/deduction_c++23.cc
index 856e0b8..132bfb8 100644
--- a/libstdc++-v3/testsuite/20_util/function/cons/deduction_c++23.cc
+++ b/libstdc++-v3/testsuite/20_util/function/cons/deduction_c++23.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/function_objects/invoke/4.cc b/libstdc++-v3/testsuite/20_util/function_objects/invoke/4.cc
index 3ee6711..38367f7 100644
--- a/libstdc++-v3/testsuite/20_util/function_objects/invoke/4.cc
+++ b/libstdc++-v3/testsuite/20_util/function_objects/invoke/4.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++2b" }
// { dg-do compile { target c++23 } }
#include <functional>
diff --git a/libstdc++-v3/testsuite/20_util/function_objects/invoke/dangling_ref.cc b/libstdc++-v3/testsuite/20_util/function_objects/invoke/dangling_ref.cc
index 1513480..c274498 100644
--- a/libstdc++-v3/testsuite/20_util/function_objects/invoke/dangling_ref.cc
+++ b/libstdc++-v3/testsuite/20_util/function_objects/invoke/dangling_ref.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <functional>
diff --git a/libstdc++-v3/testsuite/20_util/is_scoped_enum/value.cc b/libstdc++-v3/testsuite/20_util/is_scoped_enum/value.cc
index 61880ca..43dc03b 100644
--- a/libstdc++-v3/testsuite/20_util/is_scoped_enum/value.cc
+++ b/libstdc++-v3/testsuite/20_util/is_scoped_enum/value.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <type_traits>
diff --git a/libstdc++-v3/testsuite/20_util/is_scoped_enum/version.cc b/libstdc++-v3/testsuite/20_util/is_scoped_enum/version.cc
index 93eea36..698cb48 100644
--- a/libstdc++-v3/testsuite/20_util/is_scoped_enum/version.cc
+++ b/libstdc++-v3/testsuite/20_util/is_scoped_enum/version.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <version>
diff --git a/libstdc++-v3/testsuite/20_util/move_only_function/call.cc b/libstdc++-v3/testsuite/20_util/move_only_function/call.cc
index 3e15983..bfc609a 100644
--- a/libstdc++-v3/testsuite/20_util/move_only_function/call.cc
+++ b/libstdc++-v3/testsuite/20_util/move_only_function/call.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/move_only_function/cons.cc b/libstdc++-v3/testsuite/20_util/move_only_function/cons.cc
index 44e9681..ffe2398 100644
--- a/libstdc++-v3/testsuite/20_util/move_only_function/cons.cc
+++ b/libstdc++-v3/testsuite/20_util/move_only_function/cons.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/move_only_function/move.cc b/libstdc++-v3/testsuite/20_util/move_only_function/move.cc
index 0bed6ed..51e31a6 100644
--- a/libstdc++-v3/testsuite/20_util/move_only_function/move.cc
+++ b/libstdc++-v3/testsuite/20_util/move_only_function/move.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/move_only_function/version.cc b/libstdc++-v3/testsuite/20_util/move_only_function/version.cc
index f33b82f..b051a63 100644
--- a/libstdc++-v3/testsuite/20_util/move_only_function/version.cc
+++ b/libstdc++-v3/testsuite/20_util/move_only_function/version.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc b/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc
index c7e54ef..a969ca5 100644
--- a/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc
+++ b/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <optional>
diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/or_else.cc b/libstdc++-v3/testsuite/20_util/optional/monadic/or_else.cc
index 0508104..de88a2a 100644
--- a/libstdc++-v3/testsuite/20_util/optional/monadic/or_else.cc
+++ b/libstdc++-v3/testsuite/20_util/optional/monadic/or_else.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <optional>
diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/or_else_neg.cc b/libstdc++-v3/testsuite/20_util/optional/monadic/or_else_neg.cc
index 16e9486..f5028c1 100644
--- a/libstdc++-v3/testsuite/20_util/optional/monadic/or_else_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/optional/monadic/or_else_neg.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <optional>
diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/pr109242.cc b/libstdc++-v3/testsuite/20_util/optional/monadic/pr109242.cc
index a25b625..d34319e 100644
--- a/libstdc++-v3/testsuite/20_util/optional/monadic/pr109242.cc
+++ b/libstdc++-v3/testsuite/20_util/optional/monadic/pr109242.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <optional>
diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc b/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc
index b08837e..b5dd3c0 100644
--- a/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc
+++ b/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <optional>
diff --git a/libstdc++-v3/testsuite/20_util/pair/p2321r2.cc b/libstdc++-v3/testsuite/20_util/pair/p2321r2.cc
index 4f436ee..a09204c 100644
--- a/libstdc++-v3/testsuite/20_util/pair/p2321r2.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/p2321r2.cc
@@ -1,5 +1,4 @@
// Verify P2321R2 "zip" enhancements to std::pair.
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <utility>
diff --git a/libstdc++-v3/testsuite/20_util/reference_from_temporary/value.cc b/libstdc++-v3/testsuite/20_util/reference_from_temporary/value.cc
index ca02912..2df559b 100644
--- a/libstdc++-v3/testsuite/20_util/reference_from_temporary/value.cc
+++ b/libstdc++-v3/testsuite/20_util/reference_from_temporary/value.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <type_traits>
diff --git a/libstdc++-v3/testsuite/20_util/reference_from_temporary/value2.cc b/libstdc++-v3/testsuite/20_util/reference_from_temporary/value2.cc
index a06711a..2315564 100644
--- a/libstdc++-v3/testsuite/20_util/reference_from_temporary/value2.cc
+++ b/libstdc++-v3/testsuite/20_util/reference_from_temporary/value2.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <type_traits>
diff --git a/libstdc++-v3/testsuite/20_util/reference_from_temporary/version.cc b/libstdc++-v3/testsuite/20_util/reference_from_temporary/version.cc
index cb78f35..7f42c19 100644
--- a/libstdc++-v3/testsuite/20_util/reference_from_temporary/version.cc
+++ b/libstdc++-v3/testsuite/20_util/reference_from_temporary/version.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <version>
diff --git a/libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc b/libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc
index 10855b7..e51ea4d 100644
--- a/libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <charconv>
diff --git a/libstdc++-v3/testsuite/20_util/to_chars/float128_c++23.cc b/libstdc++-v3/testsuite/20_util/to_chars/float128_c++23.cc
index 318a356..f130626 100644
--- a/libstdc++-v3/testsuite/20_util/to_chars/float128_c++23.cc
+++ b/libstdc++-v3/testsuite/20_util/to_chars/float128_c++23.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do run { target c++23 } }
// { dg-require-effective-target ieee_floats }
// { dg-require-effective-target size32plus }
diff --git a/libstdc++-v3/testsuite/20_util/to_chars/float16_c++23.cc b/libstdc++-v3/testsuite/20_util/to_chars/float16_c++23.cc
index c6f8109..4db5339 100644
--- a/libstdc++-v3/testsuite/20_util/to_chars/float16_c++23.cc
+++ b/libstdc++-v3/testsuite/20_util/to_chars/float16_c++23.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do run { target c++23 } }
// { dg-require-effective-target ieee_floats }
// { dg-require-effective-target size32plus }
diff --git a/libstdc++-v3/testsuite/20_util/to_chars/version.cc b/libstdc++-v3/testsuite/20_util/to_chars/version.cc
index f7866ec..df1804e 100644
--- a/libstdc++-v3/testsuite/20_util/to_chars/version.cc
+++ b/libstdc++-v3/testsuite/20_util/to_chars/version.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do preprocess { target c++23 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/to_underlying/1.cc b/libstdc++-v3/testsuite/20_util/to_underlying/1.cc
index a215dfc..c970238 100644
--- a/libstdc++-v3/testsuite/20_util/to_underlying/1.cc
+++ b/libstdc++-v3/testsuite/20_util/to_underlying/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++23" }
// { dg-do compile { target c++23 } }
#include <utility>
diff --git a/libstdc++-v3/testsuite/20_util/to_underlying/version.cc b/libstdc++-v3/testsuite/20_util/to_underlying/version.cc
index 0a4df49..f800d7c 100644
--- a/libstdc++-v3/testsuite/20_util/to_underlying/version.cc
+++ b/libstdc++-v3/testsuite/20_util/to_underlying/version.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <version>
diff --git a/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc b/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc
index ceed38b..774968d 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc
@@ -1,5 +1,4 @@
// Verify P2321R2 "zip" enhancements to std::tuple.
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
// FIXME [!HOSTED]: avoidable std::allocator usage
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/constexpr.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/constexpr.cc
index fb4acbda..30f8d45 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <memory>
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/comparison/constexpr.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/comparison/constexpr.cc
index 83e4f08..9c1da0b 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/comparison/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/comparison/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <memory>
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/constexpr_c++20.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/constexpr_c++20.cc
index 243d80a..02cbd92 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/constexpr_c++20.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/constexpr_c++20.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <memory>
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/constexpr.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/constexpr.cc
index f673342..d972e29 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/constexpr.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/constexpr.cc
index 81908fd..75678bc 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <memory>
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/constexpr.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/constexpr.cc
index 91a0165..0c11a96 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/constexpr.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <memory>
diff --git a/libstdc++-v3/testsuite/20_util/unreachable/1.cc b/libstdc++-v3/testsuite/20_util/unreachable/1.cc
index 0c463d5..98d801b 100644
--- a/libstdc++-v3/testsuite/20_util/unreachable/1.cc
+++ b/libstdc++-v3/testsuite/20_util/unreachable/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <utility>
diff --git a/libstdc++-v3/testsuite/20_util/unreachable/version.cc b/libstdc++-v3/testsuite/20_util/unreachable/version.cc
index c779590..b64a6cd 100644
--- a/libstdc++-v3/testsuite/20_util/unreachable/version.cc
+++ b/libstdc++-v3/testsuite/20_util/unreachable/version.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do preprocess { target c++23 } }
#include <version>
diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc
index b2595d0..c0789d7 100644
--- a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc
+++ b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/resize_and_overwrite.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/resize_and_overwrite.cc
index 3265ebc..3c88b7c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/resize_and_overwrite.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/resize_and_overwrite.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <string>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/char.cc
index d8ebb50..fc96b7f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/char.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
// Copyright (C) 2021-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/nonnull.cc
index 41bb391..f800244 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++23 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
// { dg-do compile { target c++23 } }
#include <string>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/wchar_t.cc
index 2d6b057..3fd7ef8 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/contains/wchar_t.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
// Copyright (C) 2021-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc
index 0d0fd0f..0e954cd 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <string_view>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc
index de22444..8a4b23f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <string_view>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc
index 84930f2..f59cad3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// Copyright (C) 2021-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/2.cc
index 19a8f5f..2f1b684 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/2.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// Copyright (C) 2021-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/nonnull.cc
index fafadcc..78d07b1 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/nonnull.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++23 -Wnonnull -O0 -Wno-unused-result" }
+// { dg-options "-Wnonnull -O0 -Wno-unused-result" }
// { dg-do compile { target c++23 } }
#include <string_view>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/wchar_t.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/wchar_t.cc
index 8aad6b0..02db4ef 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/wchar_t.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/wchar_t.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// Copyright (C) 2021-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc b/libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc
index 1237d6eb..334ef00 100644
--- a/libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc
+++ b/libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <queue>
diff --git a/libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc b/libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc
index 2125df5..7724095 100644
--- a/libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc
+++ b/libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <stack>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/element_access/1.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/element_access/1.cc
index 9016c02..2a43084 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/element_access/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/element_access/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// { dg-xfail-if "not supported" { debug_mode } }
diff --git a/libstdc++-v3/testsuite/24_iterators/const_iterator/1.cc b/libstdc++-v3/testsuite/24_iterators/const_iterator/1.cc
index 51befd2..8b74d11 100644
--- a/libstdc++-v3/testsuite/24_iterators/const_iterator/1.cc
+++ b/libstdc++-v3/testsuite/24_iterators/const_iterator/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <iterator>
diff --git a/libstdc++-v3/testsuite/25_algorithms/contains/1.cc b/libstdc++-v3/testsuite/25_algorithms/contains/1.cc
index 146ab59..7d3fa04 100644
--- a/libstdc++-v3/testsuite/25_algorithms/contains/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/contains/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/25_algorithms/contains_subrange/1.cc b/libstdc++-v3/testsuite/25_algorithms/contains_subrange/1.cc
index 6c3c99c..5482cc1 100644
--- a/libstdc++-v3/testsuite/25_algorithms/contains_subrange/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/contains_subrange/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/25_algorithms/find_last/1.cc b/libstdc++-v3/testsuite/25_algorithms/find_last/1.cc
index ef5844c..911e228 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find_last/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find_last/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/25_algorithms/find_last_if/1.cc b/libstdc++-v3/testsuite/25_algorithms/find_last_if/1.cc
index 0a72347..1e880b3 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find_last_if/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find_last_if/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/25_algorithms/find_last_if_not/1.cc b/libstdc++-v3/testsuite/25_algorithms/find_last_if_not/1.cc
index 98aa94b..907c24a 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find_last_if_not/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find_last_if_not/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc b/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc
index 4041d13..b08a065 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/25_algorithms/fold_right/1.cc b/libstdc++-v3/testsuite/25_algorithms/fold_right/1.cc
index b08b57c..207d51f 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fold_right/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fold_right/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/25_algorithms/iota/1.cc b/libstdc++-v3/testsuite/25_algorithms/iota/1.cc
index ad2bf08..61bf418 100644
--- a/libstdc++-v3/testsuite/25_algorithms/iota/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/iota/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/byteswap.cc b/libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/byteswap.cc
index 19f852f..034019b 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/byteswap.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/byteswap.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do compile { target c++23 } }
#include <bit>
diff --git a/libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/version.cc b/libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/version.cc
index ffe2566..c179944 100644
--- a/libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/version.cc
+++ b/libstdc++-v3/testsuite/26_numerics/bit/bit.byteswap/version.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do compile { target c++23 } }
#include <version>
diff --git a/libstdc++-v3/testsuite/26_numerics/complex/ext_c++23.cc b/libstdc++-v3/testsuite/26_numerics/complex/ext_c++23.cc
index 68edcd2..f845457 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex/ext_c++23.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex/ext_c++23.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do link { target c++23 } }
#include <stdfloat>
diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++23.cc b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++23.cc
index 50612fc..653e228 100644
--- a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++23.cc
+++ b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++23.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do link { target c++23 } }
// { dg-excess-errors "" { target uclibc } }
diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cmath/constexpr_std_c++23.cc b/libstdc++-v3/testsuite/26_numerics/headers/cmath/constexpr_std_c++23.cc
index 5800f3b..efcebe4 100644
--- a/libstdc++-v3/testsuite/26_numerics/headers/cmath/constexpr_std_c++23.cc
+++ b/libstdc++-v3/testsuite/26_numerics/headers/cmath/constexpr_std_c++23.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do link { target c++23 } }
#include <stdfloat>
diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cmath/functions_std_c++23.cc b/libstdc++-v3/testsuite/26_numerics/headers/cmath/functions_std_c++23.cc
index ce529af..d9acc6a 100644
--- a/libstdc++-v3/testsuite/26_numerics/headers/cmath/functions_std_c++23.cc
+++ b/libstdc++-v3/testsuite/26_numerics/headers/cmath/functions_std_c++23.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do link { target c++23 } }
#include <stdfloat>
diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cmath/nextafter_c++23.cc b/libstdc++-v3/testsuite/26_numerics/headers/cmath/nextafter_c++23.cc
index 462a601..8745076 100644
--- a/libstdc++-v3/testsuite/26_numerics/headers/cmath/nextafter_c++23.cc
+++ b/libstdc++-v3/testsuite/26_numerics/headers/cmath/nextafter_c++23.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do run { target c++23 } }
#include <stdfloat>
diff --git a/libstdc++-v3/testsuite/26_numerics/numbers/4.cc b/libstdc++-v3/testsuite/26_numerics/numbers/4.cc
index e89167e..990a167 100644
--- a/libstdc++-v3/testsuite/26_numerics/numbers/4.cc
+++ b/libstdc++-v3/testsuite/26_numerics/numbers/4.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do compile { target c++23 } }
#include <numbers>
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/volatile_ptr.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/volatile_ptr.cc
index 151e13d..1a7d25d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/volatile_ptr.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/volatile_ptr.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++23 -fno-inline" }
+// { dg-options "-fno-inline" }
// { dg-do run { target c++23 } }
#include <sstream>
diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/native/conv_c++23.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/native/conv_c++23.cc
index b4efed2..35b0e8b 100644
--- a/libstdc++-v3/testsuite/27_io/filesystem/path/native/conv_c++23.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/path/native/conv_c++23.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <filesystem>
diff --git a/libstdc++-v3/testsuite/27_io/spanstream/1.cc b/libstdc++-v3/testsuite/27_io/spanstream/1.cc
index b66ee60..bd45a38 100644
--- a/libstdc++-v3/testsuite/27_io/spanstream/1.cc
+++ b/libstdc++-v3/testsuite/27_io/spanstream/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <spanstream>
diff --git a/libstdc++-v3/testsuite/27_io/spanstream/2.cc b/libstdc++-v3/testsuite/27_io/spanstream/2.cc
index a13a50b..6b5f622 100644
--- a/libstdc++-v3/testsuite/27_io/spanstream/2.cc
+++ b/libstdc++-v3/testsuite/27_io/spanstream/2.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <spanstream>
diff --git a/libstdc++-v3/testsuite/27_io/spanstream/version.cc b/libstdc++-v3/testsuite/27_io/spanstream/version.cc
index 26077c9..7434e3b 100644
--- a/libstdc++-v3/testsuite/27_io/spanstream/version.cc
+++ b/libstdc++-v3/testsuite/27_io/spanstream/version.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// { dg-require-effective-target hosted }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_float/requirements_cxx23.cc b/libstdc++-v3/testsuite/29_atomics/atomic_float/requirements_cxx23.cc
index df1562d..04393a7 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_float/requirements_cxx23.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_float/requirements_cxx23.cc
@@ -15,7 +15,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2b" }
// { dg-do compile { target c++23 } }
#include <atomic>
diff --git a/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/c_compat.cc b/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/c_compat.cc
index 3364c60..70d37d4 100644
--- a/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/c_compat.cc
+++ b/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/c_compat.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <stdatomic.h>
diff --git a/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/version.cc b/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/version.cc
index ab74fe6..26fa76d 100644
--- a/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/version.cc
+++ b/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/version.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do preprocess { target c++23 } }
// <stdatomic.h> is not freestanding.
diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/deduction_c++23.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/deduction_c++23.cc
index e36edfa0..6a43cf9 100644
--- a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/deduction_c++23.cc
+++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/deduction_c++23.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
#include <future>
diff --git a/libstdc++-v3/testsuite/experimental/filesystem/path/native/conv_c++23.cc b/libstdc++-v3/testsuite/experimental/filesystem/path/native/conv_c++23.cc
index 81f5754..e5e20cd 100644
--- a/libstdc++-v3/testsuite/experimental/filesystem/path/native/conv_c++23.cc
+++ b/libstdc++-v3/testsuite/experimental/filesystem/path/native/conv_c++23.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do compile { target c++23 } }
// { dg-require-filesystem-ts "" }
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc
index 19640ab..b83743a 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent_transform/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent_transform/1.cc
index c32c639..6aeedba 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent_transform/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent_transform/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/as_const/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/as_const/1.cc
index ac1be74..48c7d38 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/as_const/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/as_const/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc
index da82960..74223a6 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc
index 18b934f..7b8d4ba 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc
index a8fceb1..656c3c0 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/enumerate/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/enumerate/1.cc
index 445d985..d522168 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/enumerate/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/enumerate/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc
index 15127c0..7bed169 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc
index 96ee708..b42762d 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
// Verify LWG 3715 changes.
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc
index 8c015c1..8dfb871 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc
index 92aca35..dfc413d 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc b/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc
index ef2ece4..8938e92 100644
--- a/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc b/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc
index 6221f07..104fd22 100644
--- a/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc
+++ b/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/repeat/1.cc b/libstdc++-v3/testsuite/std/ranges/repeat/1.cc
index c62122c..3063640 100644
--- a/libstdc++-v3/testsuite/std/ranges/repeat/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/repeat/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc
index 64b7df4..f68df67 100644
--- a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc
+++ b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do preprocess { target c++23 } }
#include <version>
diff --git a/libstdc++-v3/testsuite/std/ranges/zip/1.cc b/libstdc++-v3/testsuite/std/ranges/zip/1.cc
index 8ca386d..f7c2c00 100644
--- a/libstdc++-v3/testsuite/std/ranges/zip/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/zip/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>
diff --git a/libstdc++-v3/testsuite/std/ranges/zip_transform/1.cc b/libstdc++-v3/testsuite/std/ranges/zip_transform/1.cc
index d858b02..20abdcb 100644
--- a/libstdc++-v3/testsuite/std/ranges/zip_transform/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/zip_transform/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++23" }
// { dg-do run { target c++23 } }
#include <ranges>