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/20_util/duration/arithmetic/overflow_c++20.cc:
Remove dg-options.
* testsuite/20_util/duration/io.cc: Likewise.
* testsuite/std/time/clock/file/io.cc: Likewise.
* testsuite/std/time/clock/file/members.cc: Likewise.
* testsuite/std/time/clock/file/overview.cc: Likewise.
* testsuite/std/time/clock/gps/1.cc: Likewise.
* testsuite/std/time/clock/gps/io.cc: Likewise.
* testsuite/std/time/clock/local/io.cc: Likewise.
* testsuite/std/time/clock/system/io.cc: Likewise.
* testsuite/std/time/clock/tai/1.cc: Likewise.
* testsuite/std/time/clock/tai/io.cc: Likewise.
* testsuite/std/time/clock/utc/1.cc: Likewise.
* testsuite/std/time/clock/utc/io.cc: Likewise.
* testsuite/std/time/clock/utc/leap_second_info.cc: Likewise.
* testsuite/std/time/day/1.cc: Likewise.
* testsuite/std/time/day/io.cc: Likewise.
* testsuite/std/time/exceptions.cc: Likewise.
* testsuite/std/time/format.cc: Likewise.
* testsuite/std/time/hh_mm_ss/1.cc: Likewise.
* testsuite/std/time/hh_mm_ss/109772.cc: Likewise.
* testsuite/std/time/hh_mm_ss/io.cc: Likewise.
* testsuite/std/time/is_am/1.cc: Likewise.
* testsuite/std/time/is_pm/1.cc: Likewise.
* testsuite/std/time/make12/1.cc: Likewise.
* testsuite/std/time/make24/1.cc: Likewise.
* testsuite/std/time/month/1.cc: Likewise.
* testsuite/std/time/month/io.cc: Likewise.
* testsuite/std/time/month_day/1.cc: Likewise.
* testsuite/std/time/month_day/io.cc: Likewise.
* testsuite/std/time/month_day_last/1.cc: Likewise.
* testsuite/std/time/month_day_last/io.cc: Likewise.
* testsuite/std/time/month_weekday/1.cc: Likewise.
* testsuite/std/time/month_weekday/io.cc: Likewise.
* testsuite/std/time/month_weekday_last/1.cc: Likewise.
* testsuite/std/time/month_weekday_last/io.cc: Likewise.
* testsuite/std/time/parse.cc: Likewise.
* testsuite/std/time/syn_c++20.cc: Likewise.
* testsuite/std/time/time_zone/get_info_local.cc: Likewise.
* testsuite/std/time/time_zone/get_info_sys.cc: Likewise.
* testsuite/std/time/time_zone/requirements.cc: Likewise.
* testsuite/std/time/traits/is_clock.cc: Likewise.
* testsuite/std/time/tzdb/1.cc: Likewise.
* testsuite/std/time/tzdb/leap_seconds.cc: Likewise.
* testsuite/std/time/tzdb_list/1.cc: Likewise.
* testsuite/std/time/tzdb_list/requirements.cc: Likewise.
* testsuite/std/time/weekday/1.cc: Likewise.
* testsuite/std/time/weekday/io.cc: Likewise.
* testsuite/std/time/weekday_indexed/io.cc: Likewise.
* testsuite/std/time/weekday_last/1.cc: Likewise.
* testsuite/std/time/weekday_last/io.cc: Likewise.
* testsuite/std/time/year/1.cc: Likewise.
* testsuite/std/time/year/2.cc: Likewise.
* testsuite/std/time/year/io.cc: Likewise.
* testsuite/std/time/weekday_indexed/1.cc: Likewise.
* testsuite/std/time/year_month/1.cc: Likewise.
* testsuite/std/time/year_month/2.cc: Likewise.
* testsuite/std/time/year_month/io.cc: Likewise.
* testsuite/std/time/year_month_day/1.cc: Likewise.
* testsuite/std/time/year_month_day/2.cc: Likewise.
* testsuite/std/time/year_month_day/3.cc: Likewise.
* testsuite/std/time/year_month_day/4.cc: Likewise.
* testsuite/std/time/year_month_day/io.cc: Likewise.
* testsuite/std/time/year_month_day_last/1.cc: Likewise.
* testsuite/std/time/year_month_day_last/2.cc: Likewise.
* testsuite/std/time/year_month_day_last/io.cc: Likewise.
* testsuite/std/time/year_month_weekday/1.cc: Likewise.
* testsuite/std/time/year_month_weekday/2.cc: Likewise.
* testsuite/std/time/year_month_weekday/3.cc: Likewise.
* testsuite/std/time/year_month_weekday/io.cc: Likewise.
* testsuite/std/time/year_month_weekday_last/1.cc: Likewise.
* testsuite/std/time/year_month_weekday_last/2.cc: Likewise.
* testsuite/std/time/year_month_weekday_last/io.cc: Likewise.
* testsuite/std/time/zoned_time/1.cc: Likewise.
* testsuite/std/time/zoned_time/custom.cc: Likewise.
* testsuite/std/time/zoned_time/deduction.cc: Likewise.
* testsuite/std/time/zoned_time/io.cc: Likewise.
* testsuite/std/time/zoned_time/req_neg.cc: Likewise.
* testsuite/std/time/zoned_time/requirements.cc: Likewise.
* testsuite/std/time/zoned_traits.cc: Likewise.
---
.../testsuite/20_util/duration/arithmetic/overflow_c++20.cc | 1 -
libstdc++-v3/testsuite/20_util/duration/io.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/file/io.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/file/members.cc | 3 +--
libstdc++-v3/testsuite/std/time/clock/file/overview.cc | 3 +--
libstdc++-v3/testsuite/std/time/clock/gps/1.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/gps/io.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/local/io.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/system/io.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/tai/1.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/tai/io.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/utc/1.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/utc/io.cc | 1 -
libstdc++-v3/testsuite/std/time/clock/utc/leap_second_info.cc | 1 -
libstdc++-v3/testsuite/std/time/day/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/day/io.cc | 1 -
libstdc++-v3/testsuite/std/time/exceptions.cc | 1 -
libstdc++-v3/testsuite/std/time/format.cc | 1 -
libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/hh_mm_ss/109772.cc | 1 -
libstdc++-v3/testsuite/std/time/hh_mm_ss/io.cc | 1 -
libstdc++-v3/testsuite/std/time/is_am/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/is_pm/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/make12/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/make24/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/month/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/month/io.cc | 1 -
libstdc++-v3/testsuite/std/time/month_day/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/month_day/io.cc | 1 -
libstdc++-v3/testsuite/std/time/month_day_last/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/month_day_last/io.cc | 1 -
libstdc++-v3/testsuite/std/time/month_weekday/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/month_weekday/io.cc | 1 -
libstdc++-v3/testsuite/std/time/month_weekday_last/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/month_weekday_last/io.cc | 1 -
libstdc++-v3/testsuite/std/time/parse.cc | 1 -
libstdc++-v3/testsuite/std/time/syn_c++20.cc | 3 +--
libstdc++-v3/testsuite/std/time/time_zone/get_info_local.cc | 1 -
libstdc++-v3/testsuite/std/time/time_zone/get_info_sys.cc | 1 -
libstdc++-v3/testsuite/std/time/time_zone/requirements.cc | 1 -
libstdc++-v3/testsuite/std/time/traits/is_clock.cc | 3 +--
libstdc++-v3/testsuite/std/time/tzdb/1.cc | 1 -
libstdc++-v3/testsuite/std/time/tzdb/leap_seconds.cc | 1 -
libstdc++-v3/testsuite/std/time/tzdb_list/1.cc | 1 -
libstdc++-v3/testsuite/std/time/tzdb_list/requirements.cc | 1 -
libstdc++-v3/testsuite/std/time/weekday/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/weekday/io.cc | 1 -
libstdc++-v3/testsuite/std/time/weekday_indexed/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/weekday_indexed/io.cc | 1 -
libstdc++-v3/testsuite/std/time/weekday_last/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/weekday_last/io.cc | 1 -
libstdc++-v3/testsuite/std/time/year/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/year/2.cc | 3 +--
libstdc++-v3/testsuite/std/time/year/io.cc | 1 -
libstdc++-v3/testsuite/std/time/year_month/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month/2.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month/io.cc | 1 -
libstdc++-v3/testsuite/std/time/year_month_day/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_day/2.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_day/3.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_day/4.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_day/io.cc | 1 -
libstdc++-v3/testsuite/std/time/year_month_day_last/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_day_last/2.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_day_last/io.cc | 1 -
libstdc++-v3/testsuite/std/time/year_month_weekday/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_weekday/2.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_weekday/3.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_weekday/io.cc | 1 -
libstdc++-v3/testsuite/std/time/year_month_weekday_last/1.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_weekday_last/2.cc | 3 +--
libstdc++-v3/testsuite/std/time/year_month_weekday_last/io.cc | 1 -
libstdc++-v3/testsuite/std/time/zoned_time/1.cc | 1 -
libstdc++-v3/testsuite/std/time/zoned_time/custom.cc | 1 -
libstdc++-v3/testsuite/std/time/zoned_time/deduction.cc | 1 -
libstdc++-v3/testsuite/std/time/zoned_time/io.cc | 1 -
libstdc++-v3/testsuite/std/time/zoned_time/req_neg.cc | 1 -
libstdc++-v3/testsuite/std/time/zoned_time/requirements.cc | 1 -
libstdc++-v3/testsuite/std/time/zoned_traits.cc | 1 -
79 files changed, 33 insertions(+), 112 deletions(-)
diff --git
a/libstdc++-v3/testsuite/20_util/duration/arithmetic/overflow_c++20.cc
b/libstdc++-v3/testsuite/20_util/duration/arithmetic/overflow_c++20.cc
index 42fa7ea55fb..ba1f775cb3a 100644
--- a/libstdc++-v3/testsuite/20_util/duration/arithmetic/overflow_c++20.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/arithmetic/overflow_c++20.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/20_util/duration/io.cc
b/libstdc++-v3/testsuite/20_util/duration/io.cc
index 5cbc050e210..a652a34e52f 100644
--- a/libstdc++-v3/testsuite/20_util/duration/io.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/file/io.cc
b/libstdc++-v3/testsuite/std/time/clock/file/io.cc
index a6c7c71cfd3..c3ac6cf4d6d 100644
--- a/libstdc++-v3/testsuite/std/time/clock/file/io.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/file/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/file/members.cc
b/libstdc++-v3/testsuite/std/time/clock/file/members.cc
index b34df49c650..d9949b69ad9 100644
--- a/libstdc++-v3/testsuite/std/time/clock/file/members.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/file/members.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 <chrono>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/std/time/clock/file/overview.cc
b/libstdc++-v3/testsuite/std/time/clock/file/overview.cc
index e27dfafcf07..33d31f61853 100644
--- a/libstdc++-v3/testsuite/std/time/clock/file/overview.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/file/overview.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 <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/gps/1.cc
b/libstdc++-v3/testsuite/std/time/clock/gps/1.cc
index f6bfe49207d..8be517b316b 100644
--- a/libstdc++-v3/testsuite/std/time/clock/gps/1.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/gps/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/gps/io.cc
b/libstdc++-v3/testsuite/std/time/clock/gps/io.cc
index c4fe9bee0f1..eac1c13c63a 100644
--- a/libstdc++-v3/testsuite/std/time/clock/gps/io.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/gps/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/local/io.cc
b/libstdc++-v3/testsuite/std/time/clock/local/io.cc
index a7c018d95d4..b16ddbab90b 100644
--- a/libstdc++-v3/testsuite/std/time/clock/local/io.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/local/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/system/io.cc
b/libstdc++-v3/testsuite/std/time/clock/system/io.cc
index 8bfaad3278e..d0962353c29 100644
--- a/libstdc++-v3/testsuite/std/time/clock/system/io.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/system/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/tai/1.cc
b/libstdc++-v3/testsuite/std/time/clock/tai/1.cc
index 08fc972c550..63cc9927859 100644
--- a/libstdc++-v3/testsuite/std/time/clock/tai/1.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/tai/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/tai/io.cc
b/libstdc++-v3/testsuite/std/time/clock/tai/io.cc
index 530af75442b..0c5b5872d0c 100644
--- a/libstdc++-v3/testsuite/std/time/clock/tai/io.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/tai/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/utc/1.cc
b/libstdc++-v3/testsuite/std/time/clock/utc/1.cc
index 18578fb1ab1..4852658001e 100644
--- a/libstdc++-v3/testsuite/std/time/clock/utc/1.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/utc/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/utc/io.cc
b/libstdc++-v3/testsuite/std/time/clock/utc/io.cc
index c49f6f7e22c..f39eb3f3e8e 100644
--- a/libstdc++-v3/testsuite/std/time/clock/utc/io.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/utc/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/clock/utc/leap_second_info.cc
b/libstdc++-v3/testsuite/std/time/clock/utc/leap_second_info.cc
index 0140c756dab..2fabda49423 100644
--- a/libstdc++-v3/testsuite/std/time/clock/utc/leap_second_info.cc
+++ b/libstdc++-v3/testsuite/std/time/clock/utc/leap_second_info.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-additional-options "-DHAVE_TZDB" { target tzdb } }
diff --git a/libstdc++-v3/testsuite/std/time/day/1.cc
b/libstdc++-v3/testsuite/std/time/day/1.cc
index 8f1632f53d7..60bdc6cc4fd 100644
--- a/libstdc++-v3/testsuite/std/time/day/1.cc
+++ b/libstdc++-v3/testsuite/std/time/day/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/day/io.cc
b/libstdc++-v3/testsuite/std/time/day/io.cc
index d8691b72066..cf5cd3439c4 100644
--- a/libstdc++-v3/testsuite/std/time/day/io.cc
+++ b/libstdc++-v3/testsuite/std/time/day/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/exceptions.cc
b/libstdc++-v3/testsuite/std/time/exceptions.cc
index 650b1fe7a37..06b8a53c353 100644
--- a/libstdc++-v3/testsuite/std/time/exceptions.cc
+++ b/libstdc++-v3/testsuite/std/time/exceptions.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target tzdb }
diff --git a/libstdc++-v3/testsuite/std/time/format.cc
b/libstdc++-v3/testsuite/std/time/format.cc
index 0dc45d58dce..97035e2cdd4 100644
--- a/libstdc++-v3/testsuite/std/time/format.cc
+++ b/libstdc++-v3/testsuite/std/time/format.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc
b/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc
index 85f991c5e03..b581cb02203 100644
--- a/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc
+++ b/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/hh_mm_ss/109772.cc
b/libstdc++-v3/testsuite/std/time/hh_mm_ss/109772.cc
index 36137f283d2..4aa3e31b8cd 100644
--- a/libstdc++-v3/testsuite/std/time/hh_mm_ss/109772.cc
+++ b/libstdc++-v3/testsuite/std/time/hh_mm_ss/109772.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
// PR libstdc++/109772 Memory layout optimization of chrono::hh_mm_ss is wrong
diff --git a/libstdc++-v3/testsuite/std/time/hh_mm_ss/io.cc
b/libstdc++-v3/testsuite/std/time/hh_mm_ss/io.cc
index ddb1ad77d1e..e431f0cf918 100644
--- a/libstdc++-v3/testsuite/std/time/hh_mm_ss/io.cc
+++ b/libstdc++-v3/testsuite/std/time/hh_mm_ss/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/is_am/1.cc
b/libstdc++-v3/testsuite/std/time/is_am/1.cc
index aef660c96f5..de3f3d96f6f 100644
--- a/libstdc++-v3/testsuite/std/time/is_am/1.cc
+++ b/libstdc++-v3/testsuite/std/time/is_am/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/is_pm/1.cc
b/libstdc++-v3/testsuite/std/time/is_pm/1.cc
index d7ee974031e..6c059c79740 100644
--- a/libstdc++-v3/testsuite/std/time/is_pm/1.cc
+++ b/libstdc++-v3/testsuite/std/time/is_pm/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/make12/1.cc
b/libstdc++-v3/testsuite/std/time/make12/1.cc
index b516df292fd..1ccf19a353c 100644
--- a/libstdc++-v3/testsuite/std/time/make12/1.cc
+++ b/libstdc++-v3/testsuite/std/time/make12/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/make24/1.cc
b/libstdc++-v3/testsuite/std/time/make24/1.cc
index 99f9d807247..6ede9222f35 100644
--- a/libstdc++-v3/testsuite/std/time/make24/1.cc
+++ b/libstdc++-v3/testsuite/std/time/make24/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/month/1.cc
b/libstdc++-v3/testsuite/std/time/month/1.cc
index 89cb9aba152..773f772bf07 100644
--- a/libstdc++-v3/testsuite/std/time/month/1.cc
+++ b/libstdc++-v3/testsuite/std/time/month/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/month/io.cc
b/libstdc++-v3/testsuite/std/time/month/io.cc
index 9cf5b053f2b..fb1c6425f4c 100644
--- a/libstdc++-v3/testsuite/std/time/month/io.cc
+++ b/libstdc++-v3/testsuite/std/time/month/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/month_day/1.cc
b/libstdc++-v3/testsuite/std/time/month_day/1.cc
index 8c7553c1751..2c265676952 100644
--- a/libstdc++-v3/testsuite/std/time/month_day/1.cc
+++ b/libstdc++-v3/testsuite/std/time/month_day/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/month_day/io.cc
b/libstdc++-v3/testsuite/std/time/month_day/io.cc
index a3f4599fb4e..4dafbb212f6 100644
--- a/libstdc++-v3/testsuite/std/time/month_day/io.cc
+++ b/libstdc++-v3/testsuite/std/time/month_day/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/month_day_last/1.cc
b/libstdc++-v3/testsuite/std/time/month_day_last/1.cc
index 92326ce7194..4ebf643db7b 100644
--- a/libstdc++-v3/testsuite/std/time/month_day_last/1.cc
+++ b/libstdc++-v3/testsuite/std/time/month_day_last/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/month_day_last/io.cc
b/libstdc++-v3/testsuite/std/time/month_day_last/io.cc
index 6bd95d9d524..4f430d4e3e3 100644
--- a/libstdc++-v3/testsuite/std/time/month_day_last/io.cc
+++ b/libstdc++-v3/testsuite/std/time/month_day_last/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/month_weekday/1.cc
b/libstdc++-v3/testsuite/std/time/month_weekday/1.cc
index b332c65f709..7bcdf510da0 100644
--- a/libstdc++-v3/testsuite/std/time/month_weekday/1.cc
+++ b/libstdc++-v3/testsuite/std/time/month_weekday/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/month_weekday/io.cc
b/libstdc++-v3/testsuite/std/time/month_weekday/io.cc
index a62f84a16aa..ee841eb1ef1 100644
--- a/libstdc++-v3/testsuite/std/time/month_weekday/io.cc
+++ b/libstdc++-v3/testsuite/std/time/month_weekday/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/month_weekday_last/1.cc
b/libstdc++-v3/testsuite/std/time/month_weekday_last/1.cc
index ff86e1d3295..208c34be939 100644
--- a/libstdc++-v3/testsuite/std/time/month_weekday_last/1.cc
+++ b/libstdc++-v3/testsuite/std/time/month_weekday_last/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/month_weekday_last/io.cc
b/libstdc++-v3/testsuite/std/time/month_weekday_last/io.cc
index f69cc187ce8..96a9ad9bd62 100644
--- a/libstdc++-v3/testsuite/std/time/month_weekday_last/io.cc
+++ b/libstdc++-v3/testsuite/std/time/month_weekday_last/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/parse.cc
b/libstdc++-v3/testsuite/std/time/parse.cc
index 0ef56cf1cfa..8bb0fd0beba 100644
--- a/libstdc++-v3/testsuite/std/time/parse.cc
+++ b/libstdc++-v3/testsuite/std/time/parse.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/syn_c++20.cc
b/libstdc++-v3/testsuite/std/time/syn_c++20.cc
index 307d84e5435..9f0e5ee5a9d 100644
--- a/libstdc++-v3/testsuite/std/time/syn_c++20.cc
+++ b/libstdc++-v3/testsuite/std/time/syn_c++20.cc
@@ -15,8 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
#include <chrono>
diff --git a/libstdc++-v3/testsuite/std/time/time_zone/get_info_local.cc
b/libstdc++-v3/testsuite/std/time/time_zone/get_info_local.cc
index e5e342dcff9..d2972aca7df 100644
--- a/libstdc++-v3/testsuite/std/time/time_zone/get_info_local.cc
+++ b/libstdc++-v3/testsuite/std/time/time_zone/get_info_local.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target tzdb }
diff --git a/libstdc++-v3/testsuite/std/time/time_zone/get_info_sys.cc
b/libstdc++-v3/testsuite/std/time/time_zone/get_info_sys.cc
index a669b68e440..769c7744017 100644
--- a/libstdc++-v3/testsuite/std/time/time_zone/get_info_sys.cc
+++ b/libstdc++-v3/testsuite/std/time/time_zone/get_info_sys.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target tzdb }
diff --git a/libstdc++-v3/testsuite/std/time/time_zone/requirements.cc
b/libstdc++-v3/testsuite/std/time/time_zone/requirements.cc
index 9bbe3193b2d..929fea2c0eb 100644
--- a/libstdc++-v3/testsuite/std/time/time_zone/requirements.cc
+++ b/libstdc++-v3/testsuite/std/time/time_zone/requirements.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/std/time/traits/is_clock.cc
b/libstdc++-v3/testsuite/std/time/traits/is_clock.cc
index 94c1a0801c5..1d936a53629 100644
--- a/libstdc++-v3/testsuite/std/time/traits/is_clock.cc
+++ b/libstdc++-v3/testsuite/std/time/traits/is_clock.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 <chrono>
#include <slow_clock.h>
diff --git a/libstdc++-v3/testsuite/std/time/tzdb/1.cc
b/libstdc++-v3/testsuite/std/time/tzdb/1.cc
index 877a55b8d31..cf9df952577 100644
--- a/libstdc++-v3/testsuite/std/time/tzdb/1.cc
+++ b/libstdc++-v3/testsuite/std/time/tzdb/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/std/time/tzdb/leap_seconds.cc
b/libstdc++-v3/testsuite/std/time/tzdb/leap_seconds.cc
index d27038225c8..f5401a24526 100644
--- a/libstdc++-v3/testsuite/std/time/tzdb/leap_seconds.cc
+++ b/libstdc++-v3/testsuite/std/time/tzdb/leap_seconds.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target tzdb }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
b/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
index e52f346d266..587aa950277 100644
--- a/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
+++ b/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target tzdb }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/std/time/tzdb_list/requirements.cc
b/libstdc++-v3/testsuite/std/time/tzdb_list/requirements.cc
index a2fd8a4eb57..b26704f4146 100644
--- a/libstdc++-v3/testsuite/std/time/tzdb_list/requirements.cc
+++ b/libstdc++-v3/testsuite/std/time/tzdb_list/requirements.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/std/time/weekday/1.cc
b/libstdc++-v3/testsuite/std/time/weekday/1.cc
index 1e018eaa3e0..00278c8b01c 100644
--- a/libstdc++-v3/testsuite/std/time/weekday/1.cc
+++ b/libstdc++-v3/testsuite/std/time/weekday/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/weekday/io.cc
b/libstdc++-v3/testsuite/std/time/weekday/io.cc
index ba9dce00f6c..6f6a03774fa 100644
--- a/libstdc++-v3/testsuite/std/time/weekday/io.cc
+++ b/libstdc++-v3/testsuite/std/time/weekday/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/weekday_indexed/1.cc
b/libstdc++-v3/testsuite/std/time/weekday_indexed/1.cc
index feeb19b2eca..4eed4bfa392 100644
--- a/libstdc++-v3/testsuite/std/time/weekday_indexed/1.cc
+++ b/libstdc++-v3/testsuite/std/time/weekday_indexed/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/weekday_indexed/io.cc
b/libstdc++-v3/testsuite/std/time/weekday_indexed/io.cc
index cdb91f4ba11..530138ea839 100644
--- a/libstdc++-v3/testsuite/std/time/weekday_indexed/io.cc
+++ b/libstdc++-v3/testsuite/std/time/weekday_indexed/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/weekday_last/1.cc
b/libstdc++-v3/testsuite/std/time/weekday_last/1.cc
index d7259266d5b..7cb0d296a19 100644
--- a/libstdc++-v3/testsuite/std/time/weekday_last/1.cc
+++ b/libstdc++-v3/testsuite/std/time/weekday_last/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/weekday_last/io.cc
b/libstdc++-v3/testsuite/std/time/weekday_last/io.cc
index b81830f8f68..de88ad20540 100644
--- a/libstdc++-v3/testsuite/std/time/weekday_last/io.cc
+++ b/libstdc++-v3/testsuite/std/time/weekday_last/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/year/1.cc
b/libstdc++-v3/testsuite/std/time/year/1.cc
index 7566b81c713..d8add1718cd 100644
--- a/libstdc++-v3/testsuite/std/time/year/1.cc
+++ b/libstdc++-v3/testsuite/std/time/year/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year/2.cc
b/libstdc++-v3/testsuite/std/time/year/2.cc
index d7041352ad1..d76593a293d 100644
--- a/libstdc++-v3/testsuite/std/time/year/2.cc
+++ b/libstdc++-v3/testsuite/std/time/year/2.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2021-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year/io.cc
b/libstdc++-v3/testsuite/std/time/year/io.cc
index 0c474647921..f26162d94cf 100644
--- a/libstdc++-v3/testsuite/std/time/year/io.cc
+++ b/libstdc++-v3/testsuite/std/time/year/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/year_month/1.cc
b/libstdc++-v3/testsuite/std/time/year_month/1.cc
index 71d92cc72bf..ceda56879cf 100644
--- a/libstdc++-v3/testsuite/std/time/year_month/1.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month/2.cc
b/libstdc++-v3/testsuite/std/time/year_month/2.cc
index 2475dbbf3b5..73c9bbfb09b 100644
--- a/libstdc++-v3/testsuite/std/time/year_month/2.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month/2.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month/io.cc
b/libstdc++-v3/testsuite/std/time/year_month/io.cc
index 8dac2486188..1b58a9e2468 100644
--- a/libstdc++-v3/testsuite/std/time/year_month/io.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/year_month_day/1.cc
b/libstdc++-v3/testsuite/std/time/year_month_day/1.cc
index dcd88b92bbe..33ac4354d01 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_day/1.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_day/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_day/2.cc
b/libstdc++-v3/testsuite/std/time/year_month_day/2.cc
index 6a0e3189968..b14985fe199 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_day/2.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_day/2.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_day/3.cc
b/libstdc++-v3/testsuite/std/time/year_month_day/3.cc
index d2982728bbf..21916e28cc9 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_day/3.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_day/3.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2021-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_day/4.cc
b/libstdc++-v3/testsuite/std/time/year_month_day/4.cc
index e76048d9965..3e72049c52c 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_day/4.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_day/4.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
// Copyright (C) 2021-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_day/io.cc
b/libstdc++-v3/testsuite/std/time/year_month_day/io.cc
index 6c30a8721ea..636b30592c8 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_day/io.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_day/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/year_month_day_last/1.cc
b/libstdc++-v3/testsuite/std/time/year_month_day_last/1.cc
index 0420a26e411..5c89b7edbca 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_day_last/1.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_day_last/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_day_last/2.cc
b/libstdc++-v3/testsuite/std/time/year_month_day_last/2.cc
index c11fe9e90e6..5e14f2832c2 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_day_last/2.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_day_last/2.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_day_last/io.cc
b/libstdc++-v3/testsuite/std/time/year_month_day_last/io.cc
index cb60f078c7e..0dcc1df9fb7 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_day_last/io.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_day_last/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/year_month_weekday/1.cc
b/libstdc++-v3/testsuite/std/time/year_month_weekday/1.cc
index 2886bb2b6f7..f8ffe1cb510 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_weekday/1.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_weekday/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_weekday/2.cc
b/libstdc++-v3/testsuite/std/time/year_month_weekday/2.cc
index 162f21fb2b3..dba993ae6fd 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_weekday/2.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_weekday/2.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_weekday/3.cc
b/libstdc++-v3/testsuite/std/time/year_month_weekday/3.cc
index 01e93b4a88e..83d0dcf796d 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_weekday/3.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_weekday/3.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_weekday/io.cc
b/libstdc++-v3/testsuite/std/time/year_month_weekday/io.cc
index 530429ff129..77fec80cca6 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_weekday/io.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_weekday/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/year_month_weekday_last/1.cc
b/libstdc++-v3/testsuite/std/time/year_month_weekday_last/1.cc
index be711495e4d..583f7706cc7 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_weekday_last/1.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_weekday_last/1.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_weekday_last/2.cc
b/libstdc++-v3/testsuite/std/time/year_month_weekday_last/2.cc
index 3a9796d66df..c7a1e31d20c 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_weekday_last/2.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_weekday_last/2.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
// Copyright (C) 2020-2023 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/std/time/year_month_weekday_last/io.cc
b/libstdc++-v3/testsuite/std/time/year_month_weekday_last/io.cc
index f6aff52f7eb..386f86875b3 100644
--- a/libstdc++-v3/testsuite/std/time/year_month_weekday_last/io.cc
+++ b/libstdc++-v3/testsuite/std/time/year_month_weekday_last/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-namedlocale "fr_FR.ISO8859-15" }
diff --git a/libstdc++-v3/testsuite/std/time/zoned_time/1.cc
b/libstdc++-v3/testsuite/std/time/zoned_time/1.cc
index d9083048b54..1623aca1c7a 100644
--- a/libstdc++-v3/testsuite/std/time/zoned_time/1.cc
+++ b/libstdc++-v3/testsuite/std/time/zoned_time/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target tzdb }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/std/time/zoned_time/custom.cc
b/libstdc++-v3/testsuite/std/time/zoned_time/custom.cc
index dc2d9c00c8d..83e1f6dca43 100644
--- a/libstdc++-v3/testsuite/std/time/zoned_time/custom.cc
+++ b/libstdc++-v3/testsuite/std/time/zoned_time/custom.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target tzdb }
diff --git a/libstdc++-v3/testsuite/std/time/zoned_time/deduction.cc
b/libstdc++-v3/testsuite/std/time/zoned_time/deduction.cc
index a26a6f49d77..05bc275f592 100644
--- a/libstdc++-v3/testsuite/std/time/zoned_time/deduction.cc
+++ b/libstdc++-v3/testsuite/std/time/zoned_time/deduction.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/std/time/zoned_time/io.cc
b/libstdc++-v3/testsuite/std/time/zoned_time/io.cc
index ad85122e85d..6f3ed4d4672 100644
--- a/libstdc++-v3/testsuite/std/time/zoned_time/io.cc
+++ b/libstdc++-v3/testsuite/std/time/zoned_time/io.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target cxx11_abi }
diff --git a/libstdc++-v3/testsuite/std/time/zoned_time/req_neg.cc
b/libstdc++-v3/testsuite/std/time/zoned_time/req_neg.cc
index ae51a250ee9..169dc6dae5c 100644
--- a/libstdc++-v3/testsuite/std/time/zoned_time/req_neg.cc
+++ b/libstdc++-v3/testsuite/std/time/zoned_time/req_neg.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/std/time/zoned_time/requirements.cc
b/libstdc++-v3/testsuite/std/time/zoned_time/requirements.cc
index 6334e589543..e7bf05e9474 100644
--- a/libstdc++-v3/testsuite/std/time/zoned_time/requirements.cc
+++ b/libstdc++-v3/testsuite/std/time/zoned_time/requirements.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/std/time/zoned_traits.cc
b/libstdc++-v3/testsuite/std/time/zoned_traits.cc
index 0cab8a2d47f..83cf6635127 100644
--- a/libstdc++-v3/testsuite/std/time/zoned_traits.cc
+++ b/libstdc++-v3/testsuite/std/time/zoned_traits.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
// { dg-do run { target c++20 } }
// { dg-require-effective-target cxx11_abi }
--
2.41.0
