[committed,5/9] libstdc++: Remove redundant -std=gnu++17 options from PMR tests

Message ID 20210510152902.GL3008@redhat.com
State New
Headers show
Series
  • [committed,1/9] libstdc++: Remove redundant -std=gnu++17 options from PSTL tests
Related show

Commit Message

Andre Vehreschild via Gcc-patches May 10, 2021, 3:29 p.m.
GCC defaults to -std=gnu++17 now anyway, and using it explicitly in the
dg-options directive prevents running these tests with different modes
such as -std=c++17 or -std=gnu++20.

Tested powerpc64le-linux. Committed to trunk.

Patch

commit 7a4e52e44a8c9e6c59060adc691de5144d3c6940
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon May 10 16:22:53 2021

    libstdc++: Remove redundant -std=gnu++17 option from PMR tests
    
    GCC defaults to -std=gnu++17 now anyway, and using it explicitly in the
    dg-options directive prevents running these tests with different modes
    such as -std=c++17 or -std=gnu++20.
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/20_util/memory_resource/1.cc: Remove -std=gnu++17
            from dg-options directive.
            * testsuite/20_util/memory_resource/2.cc: Likewise.
            * testsuite/20_util/monotonic_buffer_resource/1.cc: Likewise.
            * testsuite/20_util/monotonic_buffer_resource/93208.cc:
            Likewise.
            * testsuite/20_util/monotonic_buffer_resource/allocate.cc:
            Likewise.
            * testsuite/20_util/monotonic_buffer_resource/deallocate.cc:
            Likewise.
            * testsuite/20_util/monotonic_buffer_resource/release.cc:
            Likewise.
            * testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc:
            Likewise.
            * testsuite/20_util/polymorphic_allocator/1.cc: Likewise.
            * testsuite/20_util/polymorphic_allocator/construct_pair.cc:
            Likewise.
            * testsuite/20_util/polymorphic_allocator/resource.cc: Likewise.
            * testsuite/20_util/polymorphic_allocator/select.cc: Likewise.
            * testsuite/20_util/synchronized_pool_resource/allocate.cc:
            Likewise.
            * testsuite/20_util/synchronized_pool_resource/allocate_single.cc:
            Likewise.
            * testsuite/20_util/synchronized_pool_resource/cons.cc:
            Likewise.
            * testsuite/20_util/synchronized_pool_resource/cons_single.cc:
            Likewise.
            * testsuite/20_util/synchronized_pool_resource/is_equal.cc:
            Likewise.
            * testsuite/20_util/synchronized_pool_resource/multithreaded.cc:
            Likewise.
            * testsuite/20_util/synchronized_pool_resource/options.cc:
            Likewise.
            * testsuite/20_util/synchronized_pool_resource/release.cc:
            Likewise.
            * testsuite/20_util/synchronized_pool_resource/release_single.cc:
            Likewise.
            * testsuite/20_util/unsynchronized_pool_resource/allocate-max-chunks.cc:
            Likewise.
            * testsuite/20_util/unsynchronized_pool_resource/allocate.cc:
            Likewise.
            * testsuite/20_util/unsynchronized_pool_resource/cons.cc:
            Likewise.
            * testsuite/20_util/unsynchronized_pool_resource/is_equal.cc:
            Likewise.
            * testsuite/20_util/unsynchronized_pool_resource/options.cc:
            Likewise.
            * testsuite/20_util/unsynchronized_pool_resource/release.cc:
            Likewise.
            * testsuite/21_strings/basic_string/types/pmr_typedefs.cc:
            Likewise.
            * testsuite/23_containers/deque/types/pmr_typedefs.cc: Likewise.
            * testsuite/23_containers/deque/types/pmr_typedefs_debug.cc:
            Likewise.
            * testsuite/23_containers/forward_list/pmr_typedefs.cc:
            Likewise.
            * testsuite/23_containers/forward_list/pmr_typedefs_debug.cc:
            Likewise.
            * testsuite/23_containers/list/pmr_typedefs.cc: Likewise.
            * testsuite/23_containers/list/pmr_typedefs_debug.cc: Likewise.
            * testsuite/23_containers/map/pmr_typedefs.cc: Likewise.
            * testsuite/23_containers/map/pmr_typedefs_debug.cc: Likewise.
            * testsuite/23_containers/multimap/pmr_typedefs.cc: Likewise.
            * testsuite/23_containers/multimap/pmr_typedefs_debug.cc:
            Likewise.
            * testsuite/23_containers/multiset/pmr_typedefs.cc: Likewise.
            * testsuite/23_containers/multiset/pmr_typedefs_debug.cc:
            Likewise.
            * testsuite/23_containers/set/pmr_typedefs.cc: Likewise.
            * testsuite/23_containers/set/pmr_typedefs_debug.cc: Likewise.
            * testsuite/23_containers/unordered_map/pmr_typedefs.cc:
            Likewise.
            * testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc:
            Likewise.
            * testsuite/23_containers/unordered_multimap/pmr_typedefs.cc:
            Likewise.
            * testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc:
            Likewise.
            * testsuite/23_containers/unordered_multiset/pmr_typedefs.cc:
            Likewise.
            * testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc:
            Likewise.
            * testsuite/23_containers/unordered_set/pmr_typedefs.cc:
            Likewise.
            * testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc:
            Likewise.
            * testsuite/23_containers/vector/pmr_typedefs.cc: Likewise.
            * testsuite/23_containers/vector/types/pmr_typedefs_debug.cc:
            Likewise.
            * testsuite/28_regex/match_results/pmr_typedefs.cc: Likewise.

diff --git a/libstdc++-v3/testsuite/20_util/memory_resource/1.cc b/libstdc++-v3/testsuite/20_util/memory_resource/1.cc
index cc96a3e546d..174949da27b 100644
--- a/libstdc++-v3/testsuite/20_util/memory_resource/1.cc
+++ b/libstdc++-v3/testsuite/20_util/memory_resource/1.cc
@@ -1,4 +1,3 @@ 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 // Copyright (C) 2018-2021 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/20_util/memory_resource/2.cc b/libstdc++-v3/testsuite/20_util/memory_resource/2.cc
index 725a216d380..0c88e0b8b7e 100644
--- a/libstdc++-v3/testsuite/20_util/memory_resource/2.cc
+++ b/libstdc++-v3/testsuite/20_util/memory_resource/2.cc
@@ -1,4 +1,3 @@ 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-skip-if "" { *-*-* } { -fno-aligned-new } }
 
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/1.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/1.cc
index 9cd243c4c2f..eb7e20483e5 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/1.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/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++17" }
 // { dg-do compile { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/93208.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/93208.cc
index 3e3d3404df7..89f1d00540b 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/93208.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/93208.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 // { dg-final { scan-assembler-not "_ZT\[IS\]NSt3pmr15memory_resourceE" } }
 // { dg-final { scan-assembler-not "_ZT\[IS\]NSt3pmr25monotonic\[a-z_\]*E" } }
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/allocate.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/allocate.cc
index 95d512d4b82..40180223bae 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/allocate.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/allocate.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-require-cstdint "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/deallocate.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/deallocate.cc
index 73acdbaa754..3fcaf2b4c98 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/deallocate.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/deallocate.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-require-cstdint "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/release.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/release.cc
index 0e12632debc..5f159943499 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/release.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/release.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc
index 641a0d21cf6..51f6d07d017 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/1.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/1.cc
index 5ac106488d2..12a4322fdc4 100644
--- a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/1.cc
+++ b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/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++17" }
 // { dg-do compile { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/construct_pair.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/construct_pair.cc
index ee2737a60e7..c7dedd0d3b1 100644
--- a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/construct_pair.cc
+++ b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/construct_pair.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc
index 01bafabbc14..ad0821611f3 100644
--- a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc
+++ b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-skip-if "" { *-*-* } { -fno-aligned-new } }
 
diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/select.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/select.cc
index 71a7097576d..f53462969f5 100644
--- a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/select.cc
+++ b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/select.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-skip-if "" { *-*-* } { -fno-aligned-new } }
 
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate.cc
index f7af9b695ef..51445d65f71 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate.cc
@@ -16,7 +16,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate_single.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate_single.cc
index df9c317456b..1d03a60f3eb 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate_single.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate_single.cc
@@ -16,7 +16,6 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17" }
 // { dg-require-effective-target c++17 }
 // { dg-require-gthreads "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons.cc
index 065a6e91550..0d42bfeea89 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons.cc
@@ -16,7 +16,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons_single.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons_single.cc
index 3b370745f20..d02bb86b88a 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons_single.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons_single.cc
@@ -16,7 +16,6 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17" }
 // { dg-require-effective-target c++17 }
 // { dg-require-gthreads "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/is_equal.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/is_equal.cc
index ee2b974fff7..53804d347af 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/is_equal.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/is_equal.cc
@@ -16,7 +16,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/multithreaded.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/multithreaded.cc
index 4bf54ea955a..45a5a5bfef7 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/multithreaded.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/multithreaded.cc
@@ -16,7 +16,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/options.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/options.cc
index 7a41e647c11..c324c5341ef 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/options.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/options.cc
@@ -16,7 +16,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release.cc
index 074d3f85d85..1580304baab 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release.cc
@@ -16,7 +16,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release_single.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release_single.cc
index 5e2067d0800..250920443bd 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release_single.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release_single.cc
@@ -16,7 +16,6 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17" }
 // { dg-require-effective-target c++17 }
 // { dg-require-gthreads "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate-max-chunks.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate-max-chunks.cc
index fea3e18ccbb..c3cc858b12b 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate-max-chunks.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate-max-chunks.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate.cc
index 79fac01fb25..a76afbe87a2 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/cons.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/cons.cc
index 86b55ee47b9..fd9113368d7 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/cons.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/cons.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/is_equal.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/is_equal.cc
index 8ffc5dc7f2f..2707167cf6f 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/is_equal.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/is_equal.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/options.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/options.cc
index d746a6a21eb..f3989a144e8 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/options.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/options.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/release.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/release.cc
index bd2ccd2eda8..3ff6bd41689 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/release.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/release.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc b/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc
index 431603b2ae4..cb597a74312 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 // { dg-require-effective-target cxx11-abi }
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc
index 0e447197ba6..4c428214b20 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <deque>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc
index 401f4a88586..90c19027dbb 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc
index a8aac325caa..107d764fb26 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <forward_list>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc
index ecd9da004f3..c183b2f1959 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc
index d647c71ccad..f4908b91f96 100644
--- a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <list>
diff --git a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc
index 58e973afcad..4be0b7fe503 100644
--- a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc
index 1cab36ba59a..7ea3b6a2073 100644
--- a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <map>
diff --git a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc
index aed35cc0075..f07e68a8098 100644
--- a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc
index 70345958a66..54119f8c850 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <map>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc
index 45c85f1a9fe..6f466754a32 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc
index 4fd7dc70de2..075bb8f25f8 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <set>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc
index 287b5da41c0..c13da382284 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc
index 13e77fce91e..2a0551f5127 100644
--- a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <set>
diff --git a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc
index f937d9f6d25..7a4d05146cf 100644
--- a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc
index de5db5ea873..aeb94a1c78f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc
index cf41df0f230..2830b70cb82 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc
index 9bfcbdea09e..e10f9adae34 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc
index 80a018898eb..72d4997ee9a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc
index 255ad01e74c..d9e5e4c838c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc
index a76b5f3b3a3..5318275535b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc
index 280309293d0..14e4cf36ca6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc
index b647f5c872e..db06d8b6d17 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc
index 09a3568fd44..38ff8e7d505 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc
index fbe7a2a1a34..8eb9802be58 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc b/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc
index fcb63e5dc84..3df502d5bf7 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc
@@ -15,7 +15,6 @@ 
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 // { dg-timeout-factor 2 }
 // { dg-require-effective-target cxx11-abi }