From d7b2d92747f8d236050af3ec5741786f0f878716 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 10 May 2021 16:22:54 +0100 Subject: [PATCH] libstdc++: Remove redundant -std=gnu++17 option from algorithm 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/function_objects/searchers.cc: Remove -std=gnu++17 from dg-options directive. * testsuite/20_util/specialized_algorithms/memory_management_tools/1.cc: Likewise. * testsuite/20_util/specialized_algorithms/memory_management_tools/destroy_neg.cc: Likewise. * testsuite/20_util/specialized_algorithms/uninitialized_value_construct/94540.cc: Likewise. * testsuite/20_util/specialized_algorithms/uninitialized_value_construct/94831.cc: Likewise. * testsuite/20_util/specialized_algorithms/uninitialized_value_construct_n/94540.cc: Likewise. * testsuite/20_util/specialized_algorithms/uninitialized_value_construct_n/sizes.cc: Likewise. * testsuite/20_util/unique_ptr/specialized_algorithms/swap_cxx17.cc: Likewise. * testsuite/25_algorithms/clamp/1.cc: Likewise. * testsuite/25_algorithms/clamp/2.cc: Likewise. * testsuite/25_algorithms/clamp/constexpr.cc: Likewise. * testsuite/25_algorithms/clamp/requirements/explicit_instantiation/1.cc: Likewise. * testsuite/25_algorithms/clamp/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/for_each/for_each_n.cc: Likewise. * testsuite/25_algorithms/for_each/for_each_n_debug.cc: Likewise. * testsuite/25_algorithms/sample/1.cc: Likewise. * testsuite/25_algorithms/sample/2.cc: Likewise. * testsuite/25_algorithms/sample/3.cc: Likewise. * testsuite/25_algorithms/sample/81221.cc: Likewise. * testsuite/25_algorithms/search/searcher.cc: Likewise. * testsuite/26_numerics/exclusive_scan/1.cc: Likewise. * testsuite/26_numerics/inclusive_scan/1.cc: Likewise. * testsuite/26_numerics/reduce/1.cc: Likewise. * testsuite/26_numerics/reduce/2.cc: Likewise. * testsuite/26_numerics/transform_exclusive_scan/1.cc: Likewise. * testsuite/26_numerics/transform_inclusive_scan/1.cc: Likewise. * testsuite/26_numerics/transform_reduce/1.cc: Likewise. --- libstdc++-v3/testsuite/20_util/function_objects/searchers.cc | 1 - .../20_util/specialized_algorithms/memory_management_tools/1.cc | 1 - .../memory_management_tools/destroy_neg.cc | 1 - .../uninitialized_value_construct/94540.cc | 1 - .../uninitialized_value_construct/94831.cc | 1 - .../uninitialized_value_construct_n/94540.cc | 1 - .../uninitialized_value_construct_n/sizes.cc | 1 - .../20_util/unique_ptr/specialized_algorithms/swap_cxx17.cc | 1 - libstdc++-v3/testsuite/25_algorithms/clamp/1.cc | 1 - libstdc++-v3/testsuite/25_algorithms/clamp/2.cc | 1 - libstdc++-v3/testsuite/25_algorithms/clamp/constexpr.cc | 1 - .../25_algorithms/clamp/requirements/explicit_instantiation/1.cc | 1 - .../clamp/requirements/explicit_instantiation/pod.cc | 1 - libstdc++-v3/testsuite/25_algorithms/for_each/for_each_n.cc | 1 - .../testsuite/25_algorithms/for_each/for_each_n_debug.cc | 1 - libstdc++-v3/testsuite/25_algorithms/sample/1.cc | 1 - libstdc++-v3/testsuite/25_algorithms/sample/2.cc | 1 - libstdc++-v3/testsuite/25_algorithms/sample/3.cc | 1 - libstdc++-v3/testsuite/25_algorithms/sample/81221.cc | 1 - libstdc++-v3/testsuite/25_algorithms/search/searcher.cc | 1 - libstdc++-v3/testsuite/26_numerics/exclusive_scan/1.cc | 1 - libstdc++-v3/testsuite/26_numerics/inclusive_scan/1.cc | 1 - libstdc++-v3/testsuite/26_numerics/reduce/1.cc | 1 - libstdc++-v3/testsuite/26_numerics/reduce/2.cc | 1 - libstdc++-v3/testsuite/26_numerics/transform_exclusive_scan/1.cc | 1 - libstdc++-v3/testsuite/26_numerics/transform_inclusive_scan/1.cc | 1 - libstdc++-v3/testsuite/26_numerics/transform_reduce/1.cc | 1 - 27 files changed, 27 deletions(-) diff --git a/libstdc++-v3/testsuite/20_util/function_objects/searchers.cc b/libstdc++-v3/testsuite/20_util/function_objects/searchers.cc index 4f134d91e006..f8899659cbed 100644 --- a/libstdc++-v3/testsuite/20_util/function_objects/searchers.cc +++ b/libstdc++-v3/testsuite/20_util/function_objects/searchers.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/specialized_algorithms/memory_management_tools/1.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/1.cc index a4a7725ce3ce..cabed8bd4610 100644 --- a/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/1.cc +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/1.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/specialized_algorithms/memory_management_tools/destroy_neg.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/destroy_neg.cc index 626f2e1c6ee1..e114168842e4 100644 --- a/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/destroy_neg.cc +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/destroy_neg.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/specialized_algorithms/uninitialized_value_construct/94540.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/94540.cc index 51fb18949e4a..865f29cddbde 100644 --- a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/94540.cc +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/94540.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 && { ! simulator } } } } #include diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/94831.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/94831.cc index 6d9635ee6c91..8ab9df323476 100644 --- a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/94831.cc +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/94831.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/specialized_algorithms/uninitialized_value_construct_n/94540.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct_n/94540.cc index 9de74c29074c..5fd4e550f75d 100644 --- a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct_n/94540.cc +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct_n/94540.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 && { ! simulator } } } } #include diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct_n/sizes.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct_n/sizes.cc index 5833f7ed6c30..f1f4f1f46e45 100644 --- a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct_n/sizes.cc +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct_n/sizes.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/unique_ptr/specialized_algorithms/swap_cxx17.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/swap_cxx17.cc index fdb3cf89d131..f1c17a426940 100644 --- a/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/swap_cxx17.cc +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/swap_cxx17.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // Copyright (C) 2016-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/25_algorithms/clamp/1.cc b/libstdc++-v3/testsuite/25_algorithms/clamp/1.cc index e4719d7a13a2..2a24c58cee68 100644 --- a/libstdc++-v3/testsuite/25_algorithms/clamp/1.cc +++ b/libstdc++-v3/testsuite/25_algorithms/clamp/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2016-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/25_algorithms/clamp/2.cc b/libstdc++-v3/testsuite/25_algorithms/clamp/2.cc index 7884ede32c3f..23256477147f 100644 --- a/libstdc++-v3/testsuite/25_algorithms/clamp/2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/clamp/2.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2000-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/25_algorithms/clamp/constexpr.cc b/libstdc++-v3/testsuite/25_algorithms/clamp/constexpr.cc index 2f66bf858fce..46bf0f5a22a0 100644 --- a/libstdc++-v3/testsuite/25_algorithms/clamp/constexpr.cc +++ b/libstdc++-v3/testsuite/25_algorithms/clamp/constexpr.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // Copyright (C) 2016-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/25_algorithms/clamp/requirements/explicit_instantiation/1.cc b/libstdc++-v3/testsuite/25_algorithms/clamp/requirements/explicit_instantiation/1.cc index 5017aacfee7c..b64064017cc1 100644 --- a/libstdc++-v3/testsuite/25_algorithms/clamp/requirements/explicit_instantiation/1.cc +++ b/libstdc++-v3/testsuite/25_algorithms/clamp/requirements/explicit_instantiation/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // Copyright (C) 2016-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/25_algorithms/clamp/requirements/explicit_instantiation/pod.cc b/libstdc++-v3/testsuite/25_algorithms/clamp/requirements/explicit_instantiation/pod.cc index 50726161bb94..2ede166c0021 100644 --- a/libstdc++-v3/testsuite/25_algorithms/clamp/requirements/explicit_instantiation/pod.cc +++ b/libstdc++-v3/testsuite/25_algorithms/clamp/requirements/explicit_instantiation/pod.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // Copyright (C) 2016-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/25_algorithms/for_each/for_each_n.cc b/libstdc++-v3/testsuite/25_algorithms/for_each/for_each_n.cc index 72065d181bb9..625f3782e729 100644 --- a/libstdc++-v3/testsuite/25_algorithms/for_each/for_each_n.cc +++ b/libstdc++-v3/testsuite/25_algorithms/for_each/for_each_n.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2019-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/25_algorithms/for_each/for_each_n_debug.cc b/libstdc++-v3/testsuite/25_algorithms/for_each/for_each_n_debug.cc index 24ec995d90e7..43cb98db4a4f 100644 --- a/libstdc++-v3/testsuite/25_algorithms/for_each/for_each_n_debug.cc +++ b/libstdc++-v3/testsuite/25_algorithms/for_each/for_each_n_debug.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/25_algorithms/sample/1.cc b/libstdc++-v3/testsuite/25_algorithms/sample/1.cc index ade52b6cf7cc..d8adfbb49b2f 100644 --- a/libstdc++-v3/testsuite/25_algorithms/sample/1.cc +++ b/libstdc++-v3/testsuite/25_algorithms/sample/1.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/25_algorithms/sample/2.cc b/libstdc++-v3/testsuite/25_algorithms/sample/2.cc index 7d42b99ecba4..8144492a3c80 100644 --- a/libstdc++-v3/testsuite/25_algorithms/sample/2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/sample/2.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/25_algorithms/sample/3.cc b/libstdc++-v3/testsuite/25_algorithms/sample/3.cc index 6aeb1a97f8ba..7b20c67690e9 100644 --- a/libstdc++-v3/testsuite/25_algorithms/sample/3.cc +++ b/libstdc++-v3/testsuite/25_algorithms/sample/3.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/25_algorithms/sample/81221.cc b/libstdc++-v3/testsuite/25_algorithms/sample/81221.cc index 36f504c758d2..26301627b3ce 100644 --- a/libstdc++-v3/testsuite/25_algorithms/sample/81221.cc +++ b/libstdc++-v3/testsuite/25_algorithms/sample/81221.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-parallel-mode "" } diff --git a/libstdc++-v3/testsuite/25_algorithms/search/searcher.cc b/libstdc++-v3/testsuite/25_algorithms/search/searcher.cc index d1b9e45f6222..fe477ba43612 100644 --- a/libstdc++-v3/testsuite/25_algorithms/search/searcher.cc +++ b/libstdc++-v3/testsuite/25_algorithms/search/searcher.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/26_numerics/exclusive_scan/1.cc b/libstdc++-v3/testsuite/26_numerics/exclusive_scan/1.cc index 1c8c2352160d..b0f684aa5b3c 100644 --- a/libstdc++-v3/testsuite/26_numerics/exclusive_scan/1.cc +++ b/libstdc++-v3/testsuite/26_numerics/exclusive_scan/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2019-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/26_numerics/inclusive_scan/1.cc b/libstdc++-v3/testsuite/26_numerics/inclusive_scan/1.cc index 183ef6294165..ab330a12093a 100644 --- a/libstdc++-v3/testsuite/26_numerics/inclusive_scan/1.cc +++ b/libstdc++-v3/testsuite/26_numerics/inclusive_scan/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2019-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/26_numerics/reduce/1.cc b/libstdc++-v3/testsuite/26_numerics/reduce/1.cc index eceb3bea7695..134874cc3440 100644 --- a/libstdc++-v3/testsuite/26_numerics/reduce/1.cc +++ b/libstdc++-v3/testsuite/26_numerics/reduce/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2019-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/26_numerics/reduce/2.cc b/libstdc++-v3/testsuite/26_numerics/reduce/2.cc index 12396c6f37a3..7df4ef4b34e4 100644 --- a/libstdc++-v3/testsuite/26_numerics/reduce/2.cc +++ b/libstdc++-v3/testsuite/26_numerics/reduce/2.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } // Copyright (C) 2019-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/26_numerics/transform_exclusive_scan/1.cc b/libstdc++-v3/testsuite/26_numerics/transform_exclusive_scan/1.cc index 486c836ba070..5bade1fa332a 100644 --- a/libstdc++-v3/testsuite/26_numerics/transform_exclusive_scan/1.cc +++ b/libstdc++-v3/testsuite/26_numerics/transform_exclusive_scan/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2019-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/26_numerics/transform_inclusive_scan/1.cc b/libstdc++-v3/testsuite/26_numerics/transform_inclusive_scan/1.cc index 790d5f79ac50..8f36147763da 100644 --- a/libstdc++-v3/testsuite/26_numerics/transform_inclusive_scan/1.cc +++ b/libstdc++-v3/testsuite/26_numerics/transform_inclusive_scan/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2019-2021 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/26_numerics/transform_reduce/1.cc b/libstdc++-v3/testsuite/26_numerics/transform_reduce/1.cc index 20556289d6e8..5be79d93c82a 100644 --- a/libstdc++-v3/testsuite/26_numerics/transform_reduce/1.cc +++ b/libstdc++-v3/testsuite/26_numerics/transform_reduce/1.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } // Copyright (C) 2019-2021 Free Software Foundation, Inc. -- 2.39.5