aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2012-10-11 11:13:28 -0400
committerJason Merrill <jason@gcc.gnu.org>2012-10-11 11:13:28 -0400
commitbc569aa142537b208eafb6a6c935f32cc380e4b4 (patch)
treedac94c519ddecc329a799db6e3592b5e7537a80c /gcc
parente4cc27e5fb5dec11453797a3ba3515bc573839e4 (diff)
downloadgcc-bc569aa142537b208eafb6a6c935f32cc380e4b4.zip
gcc-bc569aa142537b208eafb6a6c935f32cc380e4b4.tar.gz
gcc-bc569aa142537b208eafb6a6c935f32cc380e4b4.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/ext/visibility/pragma-override1.C2
-rw-r--r--gcc/testsuite/g++.dg/ext/visibility/pragma-override2.C2
3 files changed, 5 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a9ca341..f618085 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 b813390..c13161d 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 3ceaf4a..25e9cea 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)