From: Jonathan Wakely Date: Mon, 10 May 2021 15:22:53 +0000 (+0100) Subject: libstdc++: Remove redundant -std=gnu++17 option from PMR tests X-Git-Tag: releases/gcc-11.2.0~412 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e3d4243e58b3158488eb69337cbf12b5815cfb8;p=thirdparty%2Fgcc.git 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. (cherry picked from commit 7a4e52e44a8c9e6c59060adc691de5144d3c6940) --- diff --git a/libstdc++-v3/testsuite/20_util/memory_resource/1.cc b/libstdc++-v3/testsuite/20_util/memory_resource/1.cc index cc96a3e546d0..174949da27ba 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 725a216d3808..0c88e0b8b7e1 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 9cd243c4c2f8..eb7e20483e50 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 3e3d3404df78..89f1d00540bb 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 // . -// { 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 95d512d4b825..40180223bae3 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 // . -// { 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 73acdbaa7546..3fcaf2b4c983 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 // . -// { 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 0e12632debc1..5f1599434997 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 // . -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } #include 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 641a0d21cf6e..51f6d07d0177 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 // . -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } #include diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/1.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/1.cc index 5ac106488d24..12a4322fdc4b 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 ee2737a60e7d..c7dedd0d3b10 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 // . -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } #include diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc index 01bafabbc144..ad0821611f38 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 // . -// { 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 71a7097576de..f53462969f5d 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 // . -// { 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 f7af9b695ef4..51445d65f710 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 @@ // . // { 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 df9c317456b5..1d03a60f3ebe 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 @@ // . // { 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 065a6e91550d..0d42bfeea89a 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 @@ // . // { 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 3b370745f209..d02bb86b88aa 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 @@ // . // { 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 ee2b974fff78..53804d347af4 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 @@ // . // { 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 4bf54ea955ab..45a5a5bfef75 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 @@ // . // { 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 7a41e647c116..c324c5341efb 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 @@ // . // { 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 074d3f85d855..1580304baabd 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 @@ // . // { 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 5e2067d08000..250920443bd9 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 @@ // . // { 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 fea3e18ccbbf..c3cc858b12bf 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 // . -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } #include 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 79fac01fb258..a76afbe87a2e 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 // . -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } #include 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 86b55ee47b9e..fd9113368d7a 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 // . -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } #include 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 8ffc5dc7f2f8..2707167cf6f3 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 // . -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } #include 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 d746a6a21ebe..f3989a144e85 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 // . -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } #include 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 bd2ccd2eda83..3ff6bd416890 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 // . -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } #include 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 431603b2ae4f..cb597a743121 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 // . -// { 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 0e447197ba62..4c428214b20c 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 401f4a88586e..90c19027dbb5 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 // . -// { 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 a8aac325caad..107d764fb26a 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 ecd9da004f33..c183b2f19596 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 // . -// { 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 d647c71ccadd..f4908b91f96a 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 58e973afcad2..4be0b7fe5035 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 // . -// { 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 1cab36ba59ae..7ea3b6a20738 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 aed35cc0075c..f07e68a80984 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 // . -// { 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 70345958a661..54119f8c8504 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 45c85f1a9fe7..6f466754a325 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 // . -// { 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 4fd7dc70de28..075bb8f25f8b 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 287b5da41c05..c13da382284e 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 // . -// { 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 13e77fce91eb..2a0551f5127a 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 f937d9f6d25e..7a4d05146cf3 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 // . -// { 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 de5db5ea873f..aeb94a1c78f3 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 cf41df0f2302..2830b70cb820 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 // . -// { 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 9bfcbdea09e8..e10f9adae345 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 80a018898ebb..72d4997ee9ac 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 // . -// { 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 255ad01e74c2..d9e5e4c838c9 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 a76b5f3b3a3d..5318275535b5 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 // . -// { 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 280309293d0f..14e4cf36ca6c 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 b647f5c872e7..db06d8b6d170 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 // . -// { 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 09a3568fd44e..38ff8e7d505d 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } #include 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 fbe7a2a1a34b..8eb9802be58a 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 // . -// { 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 fcb63e5dc846..3df502d5bf73 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 // . -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // { dg-timeout-factor 2 } // { dg-require-effective-target cxx11-abi }