From: Jason Merrill <jason@redhat.com>
Date: Thu, 11 Oct 2012 15:13:28 +0000 (-0400)
Subject: pragma-override1.C: Fix target markup.
X-Git-Tag: misc/gccgo-go1_1_2~229
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc569aa142537b208eafb6a6c935f32cc380e4b4;p=thirdparty%2Fgcc.git

pragma-override1.C: Fix target markup.

	* g++.dg/ext/visibility/pragma-override1.C: Fix target markup.
	* g++.dg/ext/visibility/pragma-override2.C: Fix target markup.

From-SVN: r192367
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a9ca34141edc..f61808510855 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2012-10-11  Jason Merrill  <jason@redhat.com>
 
+	* g++.dg/ext/visibility/pragma-override1.C: Fix target markup.
+	* g++.dg/ext/visibility/pragma-override2.C: Fix target markup.
+
 	* g++.dg/gomp/tls-5.C: Require tls_native.
 	* g++.dg/tls/thread_local7.C: Require tls_native.
 	* g++.dg/tls/static2.C: New.
diff --git a/gcc/testsuite/g++.dg/ext/visibility/pragma-override1.C b/gcc/testsuite/g++.dg/ext/visibility/pragma-override1.C
index b8133909a7f3..c13161d3ceb1 100644
--- a/gcc/testsuite/g++.dg/ext/visibility/pragma-override1.C
+++ b/gcc/testsuite/g++.dg/ext/visibility/pragma-override1.C
@@ -1,7 +1,7 @@
 /* Test that #pragma GCC visibility does not override class member specific settings. */
 /* { dg-do compile } */
 /* { dg-require-visibility "internal" } */
-/* { dg-final { scan-assembler "\\.internal.*Foo.methodEv" { target { ! *-*-solaris2* } { ! *-*-darwin* } } } }*/
+/* { dg-final { scan-assembler "\\.internal.*Foo.methodEv" { target { ! { *-*-solaris2* *-*-darwin* } } } } } */
 /* { dg-final { scan-assembler "\\.(internal|hidden).*Foo.methodEv" { target *-*-solaris2* } } } */
 
 #pragma GCC visibility push(hidden)
diff --git a/gcc/testsuite/g++.dg/ext/visibility/pragma-override2.C b/gcc/testsuite/g++.dg/ext/visibility/pragma-override2.C
index 3ceaf4a25235..25e9ceac0760 100644
--- a/gcc/testsuite/g++.dg/ext/visibility/pragma-override2.C
+++ b/gcc/testsuite/g++.dg/ext/visibility/pragma-override2.C
@@ -1,7 +1,7 @@
 /* Test that #pragma GCC visibility does not override class member specific settings. */
 /* { dg-do compile } */
 /* { dg-require-visibility "internal" } */
-/* { dg-final { scan-assembler "\\.internal.*Foo.methodEv" { target { ! *-*-solaris2* } { ! *-*-darwin* } } } } */
+/* { dg-final { scan-assembler "\\.internal.*Foo.methodEv" { target { ! { *-*-solaris2* *-*-darwin* } } } } } */
 /* { dg-final { scan-assembler "\\.(internal|hidden).*Foo.methodEv" { target *-*-solaris2* } } } */
 
 #pragma GCC visibility push(hidden)