From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=Hps8=E7=redhat.com=jwakely@sourceware.org>
Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	by sourceware.org (Postfix) with ESMTPS id 85383385558A
	for <libstdc++@gcc.gnu.org>; Fri, 15 Sep 2023 23:20:20 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 85383385558A
Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1694820020;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=CEjd8OhUwZyDUQXG4XHkJ0CKxniGb3Z9fozWCkDT4iQ=;
	b=V+YnhEA54vw9WiXuXgi/EA4zunLNH9EUIL54Do8Atc2lC1q23NerD6kguZaRe5cBGYNtdm
	zAcSC9xxaQWGDjf25avIowBogEJxWwktnhWrteRFTdlE+j0mp5jBt8TB17BjM3rYXEOp29
	dzno5ntVqVGfIhordyXTwGbYcUUSIxM=
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-373-1WJFTBdNM-aMKjNz3C95CQ-1; Fri, 15 Sep 2023 19:20:17 -0400
X-MC-Unique: 1WJFTBdNM-aMKjNz3C95CQ-1
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB2A7185A78E;
	Fri, 15 Sep 2023 23:20:16 +0000 (UTC)
Received: from localhost (unknown [10.42.28.190])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1EEC12026D4B;
	Fri, 15 Sep 2023 23:20:16 +0000 (UTC)
From: Jonathan Wakely <jwakely@redhat.com>
To: gcc-patches@gcc.gnu.org,
	libstdc++@gcc.gnu.org
Subject: [committed 06/11] libstdc++: Remove dg-options "-std=gnu++20" from 24_iterators tests
Date: Sat, 16 Sep 2023 00:18:54 +0100
Message-ID: <20230915232009.2348586-6-jwakely@redhat.com>
In-Reply-To: <20230915232009.2348586-1-jwakely@redhat.com>
References: <20230915232009.2348586-1-jwakely@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,URI_HEX autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
List-Id: <libstdc++.gcc.gnu.org>

Tested aarch64-linux. Pushed to trunk.

-- >8 --

The testsuite will automatically select C++20 for these tests now, and
removing the hardcoded -std option allows them to be tested for C++23
and C++26 as well.

libstdc++-v3/ChangeLog:

	* testsuite/24_iterators/aliases.cc: Remove dg-options
	-std=gnu++2a.
	* testsuite/24_iterators/associated_types/incrementable.traits.cc:
	Likewise.
	* testsuite/24_iterators/associated_types/iterator.traits.cc:
	Likewise.
	* testsuite/24_iterators/associated_types/readable.traits.cc:
	Likewise.
	* testsuite/24_iterators/back_insert_iterator/constexpr.cc:
	Likewise.
	* testsuite/24_iterators/back_insert_iterator/pr93884.cc:
	Likewise.
	* testsuite/24_iterators/bidirectional/concept.cc: Likewise.
	* testsuite/24_iterators/common_iterator/1.cc: Likewise.
	* testsuite/24_iterators/common_iterator/100823.cc: Likewise.
	* testsuite/24_iterators/common_iterator/2.cc: Likewise.
	* testsuite/24_iterators/contiguous/concept.cc: Likewise.
	* testsuite/24_iterators/contiguous/tag.cc: Likewise.
	* testsuite/24_iterators/counted_iterator/1.cc: Likewise.
	* testsuite/24_iterators/counted_iterator/lwg3389.cc: Likewise.
	* testsuite/24_iterators/counted_iterator/lwg3643.cc: Likewise.
	* testsuite/24_iterators/customization_points/92894.cc:
	Likewise.
	* testsuite/24_iterators/customization_points/iter_move.cc:
	Likewise.
	* testsuite/24_iterators/customization_points/iter_swap.cc:
	Likewise.
	* testsuite/24_iterators/customization_points/lwg3420.cc:
	Likewise.
	* testsuite/24_iterators/forward/concept.cc: Likewise.
	* testsuite/24_iterators/front_insert_iterator/constexpr.cc:
	Likewise.
	* testsuite/24_iterators/front_insert_iterator/pr93884.cc:
	Likewise.
	* testsuite/24_iterators/headers/iterator/synopsis_c++20.cc:
	Likewise.
	* testsuite/24_iterators/indirect_callable/92894.cc: Likewise.
	* testsuite/24_iterators/indirect_callable/projected-adl.cc:
	Likewise.
	* testsuite/24_iterators/indirect_callable/projected.cc:
	Likewise.
	* testsuite/24_iterators/input/concept.cc: Likewise.
	* testsuite/24_iterators/insert_iterator/constexpr.cc: Likewise.
	* testsuite/24_iterators/istream_iterator/cons/sentinel.cc:
	Likewise.
	* testsuite/24_iterators/istream_iterator/sentinel.cc: Likewise.
	* testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc:
	Likewise.
	* testsuite/24_iterators/istreambuf_iterator/sentinel.cc:
	Likewise.
	* testsuite/24_iterators/move_iterator/cust.cc: Likewise.
	* testsuite/24_iterators/move_iterator/dr3435.cc: Likewise.
	* testsuite/24_iterators/move_iterator/input_iterator.cc:
	Likewise.
	* testsuite/24_iterators/move_iterator/lwg3390.cc: Likewise.
	* testsuite/24_iterators/move_iterator/lwg3391.cc: Likewise.
	* testsuite/24_iterators/move_iterator/move_only.cc: Likewise.
	* testsuite/24_iterators/move_iterator/p2520r0.cc: Likewise.
	* testsuite/24_iterators/move_iterator/rel_ops_c++20.cc:
	Likewise.
	* testsuite/24_iterators/move_iterator/sentinel.cc: Likewise.
	* testsuite/24_iterators/normal_iterator/cmp_c++20.cc: Likewise.
	* testsuite/24_iterators/output/concept.cc: Likewise.
	* testsuite/24_iterators/random_access/concept.cc: Likewise.
	* testsuite/24_iterators/range_access/range_access_cpp20.cc:
	Likewise.
	* testsuite/24_iterators/range_access/range_access_cpp20_neg.cc:
	Likewise.
	* testsuite/24_iterators/range_operations/100768.cc: Likewise.
	* testsuite/24_iterators/range_operations/advance.cc: Likewise.
	* testsuite/24_iterators/range_operations/advance_overflow.cc:
	Likewise.
	* testsuite/24_iterators/range_operations/distance.cc: Likewise.
	* testsuite/24_iterators/range_operations/lwg3392.cc: Likewise.
	* testsuite/24_iterators/range_operations/next.cc: Likewise.
	* testsuite/24_iterators/range_operations/prev.cc: Likewise.
	* testsuite/24_iterators/reverse_iterator/cust.cc: Likewise.
	* testsuite/24_iterators/reverse_iterator/dr3435.cc: Likewise.
	* testsuite/24_iterators/reverse_iterator/rel_ops_c++20.cc:
	Likewise.
---
 libstdc++-v3/testsuite/24_iterators/aliases.cc                 | 3 +--
 .../24_iterators/associated_types/incrementable.traits.cc      | 3 +--
 .../testsuite/24_iterators/associated_types/iterator.traits.cc | 3 +--
 .../testsuite/24_iterators/associated_types/readable.traits.cc | 3 +--
 .../testsuite/24_iterators/back_insert_iterator/constexpr.cc   | 3 +--
 .../testsuite/24_iterators/back_insert_iterator/pr93884.cc     | 3 +--
 libstdc++-v3/testsuite/24_iterators/bidirectional/concept.cc   | 3 +--
 libstdc++-v3/testsuite/24_iterators/common_iterator/1.cc       | 3 +--
 libstdc++-v3/testsuite/24_iterators/common_iterator/100823.cc  | 2 +-
 libstdc++-v3/testsuite/24_iterators/common_iterator/2.cc       | 3 +--
 libstdc++-v3/testsuite/24_iterators/contiguous/concept.cc      | 3 +--
 libstdc++-v3/testsuite/24_iterators/contiguous/tag.cc          | 3 +--
 libstdc++-v3/testsuite/24_iterators/counted_iterator/1.cc      | 3 +--
 .../testsuite/24_iterators/counted_iterator/lwg3389.cc         | 3 +--
 .../testsuite/24_iterators/counted_iterator/lwg3643.cc         | 1 -
 .../testsuite/24_iterators/customization_points/92894.cc       | 3 +--
 .../testsuite/24_iterators/customization_points/iter_move.cc   | 3 +--
 .../testsuite/24_iterators/customization_points/iter_swap.cc   | 3 +--
 .../testsuite/24_iterators/customization_points/lwg3420.cc     | 3 +--
 libstdc++-v3/testsuite/24_iterators/forward/concept.cc         | 3 +--
 .../testsuite/24_iterators/front_insert_iterator/constexpr.cc  | 3 +--
 .../testsuite/24_iterators/front_insert_iterator/pr93884.cc    | 3 +--
 .../testsuite/24_iterators/headers/iterator/synopsis_c++20.cc  | 3 +--
 libstdc++-v3/testsuite/24_iterators/indirect_callable/92894.cc | 3 +--
 .../testsuite/24_iterators/indirect_callable/projected-adl.cc  | 1 -
 .../testsuite/24_iterators/indirect_callable/projected.cc      | 3 +--
 libstdc++-v3/testsuite/24_iterators/input/concept.cc           | 3 +--
 .../testsuite/24_iterators/insert_iterator/constexpr.cc        | 3 +--
 .../testsuite/24_iterators/istream_iterator/cons/sentinel.cc   | 3 +--
 .../testsuite/24_iterators/istream_iterator/sentinel.cc        | 3 +--
 .../24_iterators/istreambuf_iterator/cons/sentinel.cc          | 3 +--
 .../testsuite/24_iterators/istreambuf_iterator/sentinel.cc     | 3 +--
 libstdc++-v3/testsuite/24_iterators/move_iterator/cust.cc      | 3 +--
 libstdc++-v3/testsuite/24_iterators/move_iterator/dr3435.cc    | 3 +--
 .../testsuite/24_iterators/move_iterator/input_iterator.cc     | 3 +--
 libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3390.cc   | 3 +--
 libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3391.cc   | 3 +--
 libstdc++-v3/testsuite/24_iterators/move_iterator/move_only.cc | 3 +--
 libstdc++-v3/testsuite/24_iterators/move_iterator/p2520r0.cc   | 1 -
 .../testsuite/24_iterators/move_iterator/rel_ops_c++20.cc      | 3 +--
 libstdc++-v3/testsuite/24_iterators/move_iterator/sentinel.cc  | 3 +--
 .../testsuite/24_iterators/normal_iterator/cmp_c++20.cc        | 3 +--
 libstdc++-v3/testsuite/24_iterators/output/concept.cc          | 3 +--
 libstdc++-v3/testsuite/24_iterators/random_access/concept.cc   | 3 +--
 .../testsuite/24_iterators/range_access/range_access_cpp20.cc  | 3 +--
 .../24_iterators/range_access/range_access_cpp20_neg.cc        | 3 +--
 libstdc++-v3/testsuite/24_iterators/range_operations/100768.cc | 1 -
 .../testsuite/24_iterators/range_operations/advance.cc         | 3 +--
 .../24_iterators/range_operations/advance_overflow.cc          | 1 -
 .../testsuite/24_iterators/range_operations/distance.cc        | 3 +--
 .../testsuite/24_iterators/range_operations/lwg3392.cc         | 1 -
 libstdc++-v3/testsuite/24_iterators/range_operations/next.cc   | 3 +--
 libstdc++-v3/testsuite/24_iterators/range_operations/prev.cc   | 3 +--
 libstdc++-v3/testsuite/24_iterators/reverse_iterator/cust.cc   | 3 +--
 libstdc++-v3/testsuite/24_iterators/reverse_iterator/dr3435.cc | 3 +--
 .../testsuite/24_iterators/reverse_iterator/rel_ops_c++20.cc   | 3 +--
 56 files changed, 50 insertions(+), 105 deletions(-)

diff --git a/libstdc++-v3/testsuite/24_iterators/aliases.cc b/libstdc++-v3/testsuite/24_iterators/aliases.cc
index 4abec9d48dc..89ee99694f6 100644
--- a/libstdc++-v3/testsuite/24_iterators/aliases.cc
+++ b/libstdc++-v3/testsuite/24_iterators/aliases.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/associated_types/incrementable.traits.cc b/libstdc++-v3/testsuite/24_iterators/associated_types/incrementable.traits.cc
index ba6c2de81df..54f96c6cf4b 100644
--- a/libstdc++-v3/testsuite/24_iterators/associated_types/incrementable.traits.cc
+++ b/libstdc++-v3/testsuite/24_iterators/associated_types/incrementable.traits.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/associated_types/iterator.traits.cc b/libstdc++-v3/testsuite/24_iterators/associated_types/iterator.traits.cc
index d7b0d170fc9..f9793973717 100644
--- a/libstdc++-v3/testsuite/24_iterators/associated_types/iterator.traits.cc
+++ b/libstdc++-v3/testsuite/24_iterators/associated_types/iterator.traits.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/associated_types/readable.traits.cc b/libstdc++-v3/testsuite/24_iterators/associated_types/readable.traits.cc
index 8fc66cf51bf..9d0399105f1 100644
--- a/libstdc++-v3/testsuite/24_iterators/associated_types/readable.traits.cc
+++ b/libstdc++-v3/testsuite/24_iterators/associated_types/readable.traits.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/back_insert_iterator/constexpr.cc b/libstdc++-v3/testsuite/24_iterators/back_insert_iterator/constexpr.cc
index 8155ec28373..9bb8e961f47 100644
--- a/libstdc++-v3/testsuite/24_iterators/back_insert_iterator/constexpr.cc
+++ b/libstdc++-v3/testsuite/24_iterators/back_insert_iterator/constexpr.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/back_insert_iterator/pr93884.cc b/libstdc++-v3/testsuite/24_iterators/back_insert_iterator/pr93884.cc
index 3a284a00d00..6e016529181 100644
--- a/libstdc++-v3/testsuite/24_iterators/back_insert_iterator/pr93884.cc
+++ b/libstdc++-v3/testsuite/24_iterators/back_insert_iterator/pr93884.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 <iterator>
 #include <algorithm>
diff --git a/libstdc++-v3/testsuite/24_iterators/bidirectional/concept.cc b/libstdc++-v3/testsuite/24_iterators/bidirectional/concept.cc
index d053ad352ef..a239ef802f2 100644
--- a/libstdc++-v3/testsuite/24_iterators/bidirectional/concept.cc
+++ b/libstdc++-v3/testsuite/24_iterators/bidirectional/concept.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/common_iterator/1.cc b/libstdc++-v3/testsuite/24_iterators/common_iterator/1.cc
index f251e3cfc04..7448d914b1b 100644
--- a/libstdc++-v3/testsuite/24_iterators/common_iterator/1.cc
+++ b/libstdc++-v3/testsuite/24_iterators/common_iterator/1.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 #include <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/common_iterator/100823.cc b/libstdc++-v3/testsuite/24_iterators/common_iterator/100823.cc
index b42dd087ab2..0784aec58ed 100644
--- a/libstdc++-v3/testsuite/24_iterators/common_iterator/100823.cc
+++ b/libstdc++-v3/testsuite/24_iterators/common_iterator/100823.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++20 -D_GLIBCXX_ASSERTIONS" }
+// { dg-options "-D_GLIBCXX_ASSERTIONS" }
 // { dg-do run { target c++20 } }
 #include <iterator>
 #include <testsuite_iterators.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/common_iterator/2.cc b/libstdc++-v3/testsuite/24_iterators/common_iterator/2.cc
index 8f41e276b14..4d77094fe93 100644
--- a/libstdc++-v3/testsuite/24_iterators/common_iterator/2.cc
+++ b/libstdc++-v3/testsuite/24_iterators/common_iterator/2.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 #include <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/contiguous/concept.cc b/libstdc++-v3/testsuite/24_iterators/contiguous/concept.cc
index 2ce5537308c..b567740267c 100644
--- a/libstdc++-v3/testsuite/24_iterators/contiguous/concept.cc
+++ b/libstdc++-v3/testsuite/24_iterators/contiguous/concept.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/contiguous/tag.cc b/libstdc++-v3/testsuite/24_iterators/contiguous/tag.cc
index 308bd962eaa..e51c9d68256 100644
--- a/libstdc++-v3/testsuite/24_iterators/contiguous/tag.cc
+++ b/libstdc++-v3/testsuite/24_iterators/contiguous/tag.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/counted_iterator/1.cc b/libstdc++-v3/testsuite/24_iterators/counted_iterator/1.cc
index 2c3ea4ff563..47b3ca23d76 100644
--- a/libstdc++-v3/testsuite/24_iterators/counted_iterator/1.cc
+++ b/libstdc++-v3/testsuite/24_iterators/counted_iterator/1.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 #include <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3389.cc b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3389.cc
index 33f3a04d451..0067e53b6a2 100644
--- a/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3389.cc
+++ b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3389.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc
index e6f12b46c12..e29239ef59a 100644
--- a/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc
+++ b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 
 #include <iterator>
diff --git a/libstdc++-v3/testsuite/24_iterators/customization_points/92894.cc b/libstdc++-v3/testsuite/24_iterators/customization_points/92894.cc
index 78d7a95e6b5..b9a33f30d17 100644
--- a/libstdc++-v3/testsuite/24_iterators/customization_points/92894.cc
+++ b/libstdc++-v3/testsuite/24_iterators/customization_points/92894.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/customization_points/iter_move.cc b/libstdc++-v3/testsuite/24_iterators/customization_points/iter_move.cc
index e7d8d9b16db..a5f9ef78f99 100644
--- a/libstdc++-v3/testsuite/24_iterators/customization_points/iter_move.cc
+++ b/libstdc++-v3/testsuite/24_iterators/customization_points/iter_move.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/customization_points/iter_swap.cc b/libstdc++-v3/testsuite/24_iterators/customization_points/iter_swap.cc
index 76c68594131..df0e6565343 100644
--- a/libstdc++-v3/testsuite/24_iterators/customization_points/iter_swap.cc
+++ b/libstdc++-v3/testsuite/24_iterators/customization_points/iter_swap.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/customization_points/lwg3420.cc b/libstdc++-v3/testsuite/24_iterators/customization_points/lwg3420.cc
index 2c522fc9e46..b2e3956997e 100644
--- a/libstdc++-v3/testsuite/24_iterators/customization_points/lwg3420.cc
+++ b/libstdc++-v3/testsuite/24_iterators/customization_points/lwg3420.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 } }
 
 // PR libstdc++/93983
 
diff --git a/libstdc++-v3/testsuite/24_iterators/forward/concept.cc b/libstdc++-v3/testsuite/24_iterators/forward/concept.cc
index 9711d6610ae..70ab0beba9f 100644
--- a/libstdc++-v3/testsuite/24_iterators/forward/concept.cc
+++ b/libstdc++-v3/testsuite/24_iterators/forward/concept.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/front_insert_iterator/constexpr.cc b/libstdc++-v3/testsuite/24_iterators/front_insert_iterator/constexpr.cc
index 89358413268..b6cbf03e4c1 100644
--- a/libstdc++-v3/testsuite/24_iterators/front_insert_iterator/constexpr.cc
+++ b/libstdc++-v3/testsuite/24_iterators/front_insert_iterator/constexpr.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/front_insert_iterator/pr93884.cc b/libstdc++-v3/testsuite/24_iterators/front_insert_iterator/pr93884.cc
index 08edeb3a482..d1b47a69f3f 100644
--- a/libstdc++-v3/testsuite/24_iterators/front_insert_iterator/pr93884.cc
+++ b/libstdc++-v3/testsuite/24_iterators/front_insert_iterator/pr93884.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 <iterator>
 #include <algorithm>
diff --git a/libstdc++-v3/testsuite/24_iterators/headers/iterator/synopsis_c++20.cc b/libstdc++-v3/testsuite/24_iterators/headers/iterator/synopsis_c++20.cc
index ff0b6fac3fb..f8d5119caf9 100644
--- a/libstdc++-v3/testsuite/24_iterators/headers/iterator/synopsis_c++20.cc
+++ b/libstdc++-v3/testsuite/24_iterators/headers/iterator/synopsis_c++20.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 // { dg-require-normal-namespace "" }
 
 #include <iterator>
diff --git a/libstdc++-v3/testsuite/24_iterators/indirect_callable/92894.cc b/libstdc++-v3/testsuite/24_iterators/indirect_callable/92894.cc
index 951b3ba6820..1fb1b8d3478 100644
--- a/libstdc++-v3/testsuite/24_iterators/indirect_callable/92894.cc
+++ b/libstdc++-v3/testsuite/24_iterators/indirect_callable/92894.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected-adl.cc b/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected-adl.cc
index 4c2a0955c6e..a1a5cc4392d 100644
--- a/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected-adl.cc
+++ b/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected-adl.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 
 // P2538R1 ADL-proof std::projected
diff --git a/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected.cc b/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected.cc
index f67e989f3c0..755d5a729cc 100644
--- a/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected.cc
+++ b/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/input/concept.cc b/libstdc++-v3/testsuite/24_iterators/input/concept.cc
index 44aa7e9deae..08e4e38b93c 100644
--- a/libstdc++-v3/testsuite/24_iterators/input/concept.cc
+++ b/libstdc++-v3/testsuite/24_iterators/input/concept.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/insert_iterator/constexpr.cc b/libstdc++-v3/testsuite/24_iterators/insert_iterator/constexpr.cc
index 88487592acb..ed2b6488516 100644
--- a/libstdc++-v3/testsuite/24_iterators/insert_iterator/constexpr.cc
+++ b/libstdc++-v3/testsuite/24_iterators/insert_iterator/constexpr.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/sentinel.cc b/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/sentinel.cc
index 77dc741b1be..cbf647aa45b 100644
--- a/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/sentinel.cc
+++ b/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/sentinel.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/24_iterators/istream_iterator/sentinel.cc b/libstdc++-v3/testsuite/24_iterators/istream_iterator/sentinel.cc
index eecfba72d06..d14ec8f9530 100644
--- a/libstdc++-v3/testsuite/24_iterators/istream_iterator/sentinel.cc
+++ b/libstdc++-v3/testsuite/24_iterators/istream_iterator/sentinel.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 // Copyright (C) 2020-2023 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc
index 93017809f67..c78f763d3d4 100644
--- a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc
+++ b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/cons/sentinel.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 // { dg-require-effective-target hosted }
 
 // Copyright (C) 2020-2023 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/sentinel.cc b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/sentinel.cc
index 9368833fcf2..0b10a147404 100644
--- a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/sentinel.cc
+++ b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/sentinel.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do run { target c++2a } }
+// { dg-do run { target c++20 } }
 
 // Copyright (C) 2020-2023 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/cust.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/cust.cc
index b8e38bb810b..3d73919391f 100644
--- a/libstdc++-v3/testsuite/24_iterators/move_iterator/cust.cc
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/cust.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/dr3435.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/dr3435.cc
index fbca6fe9d36..80da4c0e134 100644
--- a/libstdc++-v3/testsuite/24_iterators/move_iterator/dr3435.cc
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/dr3435.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 <iterator>
 #include <compare>
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/input_iterator.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/input_iterator.cc
index adaa12a5d71..ae53ecf572e 100644
--- a/libstdc++-v3/testsuite/24_iterators/move_iterator/input_iterator.cc
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/input_iterator.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3390.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3390.cc
index a6b57bf3a0c..d0adabf6ac0 100644
--- a/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3390.cc
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3390.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3391.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3391.cc
index 5f454e107fc..40b9da95223 100644
--- a/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3391.cc
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3391.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 } }
 
 // Verify LWG 3391 changes.
 
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/move_only.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/move_only.cc
index 01b66d2fea8..3a0e499b22c 100644
--- a/libstdc++-v3/testsuite/24_iterators/move_iterator/move_only.cc
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/move_only.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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/p2520r0.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/p2520r0.cc
index e36ac574a8e..4742e8815e4 100644
--- a/libstdc++-v3/testsuite/24_iterators/move_iterator/p2520r0.cc
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/p2520r0.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 // { dg-add-options no_pch }
 
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/rel_ops_c++20.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/rel_ops_c++20.cc
index 9f437acb50a..292baeaaf31 100644
--- a/libstdc++-v3/testsuite/24_iterators/move_iterator/rel_ops_c++20.cc
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/rel_ops_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 <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/sentinel.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/sentinel.cc
index 4ee8e46a822..a76a5801c68 100644
--- a/libstdc++-v3/testsuite/24_iterators/move_iterator/sentinel.cc
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/sentinel.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/normal_iterator/cmp_c++20.cc b/libstdc++-v3/testsuite/24_iterators/normal_iterator/cmp_c++20.cc
index 82b856883b4..da464c9bc2b 100644
--- a/libstdc++-v3/testsuite/24_iterators/normal_iterator/cmp_c++20.cc
+++ b/libstdc++-v3/testsuite/24_iterators/normal_iterator/cmp_c++20.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 #include <vector>
diff --git a/libstdc++-v3/testsuite/24_iterators/output/concept.cc b/libstdc++-v3/testsuite/24_iterators/output/concept.cc
index 9be1c14884f..f3551bd98df 100644
--- a/libstdc++-v3/testsuite/24_iterators/output/concept.cc
+++ b/libstdc++-v3/testsuite/24_iterators/output/concept.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/random_access/concept.cc b/libstdc++-v3/testsuite/24_iterators/random_access/concept.cc
index 0ed9ded8ce5..c26a4269f98 100644
--- a/libstdc++-v3/testsuite/24_iterators/random_access/concept.cc
+++ b/libstdc++-v3/testsuite/24_iterators/random_access/concept.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20.cc b/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20.cc
index 99852ebf991..e5e129e80f4 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20.cc
@@ -1,5 +1,4 @@
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 // Copyright (C) 2019-2023 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20_neg.cc b/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20_neg.cc
index af65deda3d4..03b8a3767bd 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20_neg.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20_neg.cc
@@ -15,8 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++2a" }
-// { dg-do compile { target c++2a } }
+// { dg-do compile { target c++20 } }
 
 #include <iterator>
 
diff --git a/libstdc++-v3/testsuite/24_iterators/range_operations/100768.cc b/libstdc++-v3/testsuite/24_iterators/range_operations/100768.cc
index 0c0b79cdbb6..c9f3827c61f 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_operations/100768.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_operations/100768.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 
 // PR libstdc++/100768 - Range iterator operations should be function objects
diff --git a/libstdc++-v3/testsuite/24_iterators/range_operations/advance.cc b/libstdc++-v3/testsuite/24_iterators/range_operations/advance.cc
index 62ff47e19d5..43d6877e300 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_operations/advance.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_operations/advance.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/range_operations/advance_overflow.cc b/libstdc++-v3/testsuite/24_iterators/range_operations/advance_overflow.cc
index 0fadcd6e99a..76babddd555 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_operations/advance_overflow.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_operations/advance_overflow.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 
 // Public domain testcase from Casey Carter, send to LWG list on 2021-07-24.
diff --git a/libstdc++-v3/testsuite/24_iterators/range_operations/distance.cc b/libstdc++-v3/testsuite/24_iterators/range_operations/distance.cc
index 77dc5e8fbbf..57530d6bac1 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_operations/distance.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_operations/distance.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/range_operations/lwg3392.cc b/libstdc++-v3/testsuite/24_iterators/range_operations/lwg3392.cc
index 32780353512..4125c663692 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_operations/lwg3392.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_operations/lwg3392.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
 
 #include <iterator>
diff --git a/libstdc++-v3/testsuite/24_iterators/range_operations/next.cc b/libstdc++-v3/testsuite/24_iterators/range_operations/next.cc
index ef2a73805fb..6a88e87831b 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_operations/next.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_operations/next.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/range_operations/prev.cc b/libstdc++-v3/testsuite/24_iterators/range_operations/prev.cc
index 123b4a80ab4..a40054757a6 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_operations/prev.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_operations/prev.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/cust.cc b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/cust.cc
index 77f4e08420f..5bf40aeaabe 100644
--- a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/cust.cc
+++ b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/cust.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 <iterator>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/dr3435.cc b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/dr3435.cc
index dd5afc94604..4263a860c8d 100644
--- a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/dr3435.cc
+++ b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/dr3435.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 <iterator>
 #include <compare>
diff --git a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/rel_ops_c++20.cc b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/rel_ops_c++20.cc
index 8911d8a2a18..cb7543a8557 100644
--- a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/rel_ops_c++20.cc
+++ b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/rel_ops_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 <iterator>
 
-- 
2.41.0