From bc569aa142537b208eafb6a6c935f32cc380e4b4 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 11 Oct 2012 11:13:28 -0400 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/ext/visibility/pragma-override1.C | 2 +- gcc/testsuite/g++.dg/ext/visibility/pragma-override2.C | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a9ca34141ed..f6180851085 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2012-10-11 Jason Merrill + * 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 b8133909a7f..c13161d3ceb 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 3ceaf4a2523..25e9ceac076 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) -- 2.30.2