Use dg-additional-options in libstdc++ tests

	* testsuite/17_intro/headers/c++2011/stdc++.cc: Change target-specific
	dg-options to dg-additional-options so that default options are used.
	* testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc:
	Likewise.
	* testsuite/17_intro/headers/c++2014/stdc++.cc: Likewise.
	* testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc:
	Likewise.
	* testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc:
	Use dg-additional-options instead of repeating the common options.

From-SVN: r238835

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fad941b7e224b8e6ddcc5402ffcfa9b8bda63580..3afe2bf25555afe0d8c7a5e5490243d8fb47936c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,15 @@
 2016-07-28  Jonathan Wakely  <jwakely@redhat.com>
 
+       * testsuite/17_intro/headers/c++2011/stdc++.cc: Change target-specific
+       dg-options to dg-additional-options so that default options are used.
+       * testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc:
+       Likewise.
+       * testsuite/17_intro/headers/c++2014/stdc++.cc: Likewise.
+       * testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc:
+       Likewise.
+       * testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc:
+       Use dg-additional-options instead of repeating the common options.
+
        * testsuite/22_locale/conversions/string/1.cc: Remove unintended
        dg-do compile directive.
        * testsuite/26_numerics/headers/cmath/fabs_inline.cc: Fix syntax of

diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++.cc
index 26a0e420b1116434ddbdd284c5efd5b3726f08fc..40bced7ca09fa25c835e6400264b433d39d7a4b7 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++.cc
@@ -1,6 +1,6 @@
 // FreeBSD wants warning clean system headers:
-// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
 // { dg-options "-std=gnu++11" }
+// { dg-additional-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
 // { dg-do compile }
 
 // Copyright (C) 2007-2016 Free Software Foundation, Inc.

diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc
index 69869b7aff940d0ef96ea9fd938439affc08285b..59f77486dee3ce913c29d019adb7836a7adf1951 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc
@@ -1,6 +1,6 @@
 // FreeBSD wants warning clean system headers:
-// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
 // { dg-options "-std=gnu++11" }
+// { dg-additional-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
 // { dg-do compile }
 
 // Copyright (C) 2007-2016 Free Software Foundation, Inc.

diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++.cc
index 2ab83c7827e048b7c245493d92cba7a4829d5ee0..cd74e7b98e21ac930f617546bc16ace5cf978a4e 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++.cc
@@ -1,6 +1,6 @@
 // FreeBSD wants warning clean system headers:
-// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
 // { dg-options "-std=gnu++14" }
+// { dg-additional-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
 // { dg-do compile }
 
 // Copyright (C) 2015-2016 Free Software Foundation, Inc.

diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc
index 7303143d6fd2d3a720bf5eb154d1674bb13ff167..38057238b84be6b40d36a3ef9645167e8e3fe2f5 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc
@@ -1,6 +1,6 @@
 // FreeBSD wants warning clean system headers:
-// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
 // { dg-options "-std=gnu++14" }
+// { dg-additional-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
 // { dg-do compile }
 
 // Copyright (C) 2015-2016 Free Software Foundation, Inc.

diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc
index 560eee35a29ffe5df579cb7cd4f08fc2e5c245c8..f4a88f6803135308e30187a572edd150cfc2b261 100644 (file)
--- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc
@@ -1,6 +1,6 @@
 // { dg-do compile { target i?86-*-* x86_64-*-* } }
 // { dg-options "-std=gnu++11 -g0 -fno-exceptions -fno-asynchronous-unwind-tables" }
-// { dg-options "-std=gnu++11 -g0 -fno-exceptions -fno-asynchronous-unwind-tables -march=i486" { target ia32 } }
+// { dg-additional-options "-march=i486" { target ia32 } }
 // { dg-final { scan-assembler-times "xacquire\|\.byte\[^\n\r]*0xf2" 14 } }
 // { dg-final { scan-assembler-times "xrelease\|\.byte\[^\n\r]*0xf3" 14 } }