From 4be64bdc733710a3444d0f2b8bcf6b643facb928 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Thu, 1 Jan 2015 00:00:04 +0000 Subject: [PATCH] target-supports.exp (add_options_for_tls): Prepend pthread link flags. * lib/target-supports.exp (add_options_for_tls): Prepend pthread link flags. * gcc.c-torture/execute/eeprof-1.c: Change AIX XFAIL to run-if. * g++.old-deja/g++.mike/p755a.C: XFAIL on AIX. * g++.dg/gomp/tls-5.C: Same. * g++.dg/template/linkage1.C: Same. * g++.dg/tls/thread_local1.C: Same. * g++.dg/tls/thread_local7.C: Same. * g++.dg/tls/thread_local7g.C: Same. From-SVN: r219130 --- gcc/testsuite/ChangeLog | 14 +++++++++++++- gcc/testsuite/g++.dg/gomp/tls-5.C | 2 +- gcc/testsuite/g++.dg/template/linkage1.C | 2 +- gcc/testsuite/g++.dg/tls/thread_local1.C | 2 +- gcc/testsuite/g++.dg/tls/thread_local7.C | 2 +- gcc/testsuite/g++.dg/tls/thread_local7g.C | 2 +- gcc/testsuite/g++.old-deja/g++.mike/p755a.C | 2 +- gcc/testsuite/gcc.c-torture/execute/eeprof-1.c | 2 +- gcc/testsuite/lib/target-supports.exp | 2 +- 9 files changed, 21 insertions(+), 9 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 96ca31472c1..c831ce348af 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2014-12-31 David Edelsohn + + * lib/target-supports.exp (add_options_for_tls): Prepend pthread + link flags. + * gcc.c-torture/execute/eeprof-1.c: Change AIX XFAIL to run-if. + * g++.old-deja/g++.mike/p755a.C: XFAIL on AIX. + * g++.dg/gomp/tls-5.C: Same. + * g++.dg/template/linkage1.C: Same. + * g++.dg/tls/thread_local1.C: Same. + * g++.dg/tls/thread_local7.C: Same. + * g++.dg/tls/thread_local7g.C: Same. + 2014-12-31 Tobias Burnus * gfortran.dg/error_stop_3.f90: New. @@ -913,7 +925,7 @@ predicate value. 2014-12-04 Jack Howarth - + PR testsuite/64145 * gcc.dg/graphite/isl-codegen-loop-dumping.c: Restore -fgraphite-identity. diff --git a/gcc/testsuite/g++.dg/gomp/tls-5.C b/gcc/testsuite/g++.dg/gomp/tls-5.C index 3679593af0e..e83ff1179e6 100644 --- a/gcc/testsuite/g++.dg/gomp/tls-5.C +++ b/gcc/testsuite/g++.dg/gomp/tls-5.C @@ -1,6 +1,6 @@ // The reference temp should be TLS, not normal data. // { dg-require-effective-target c++11 } -// { dg-final { scan-assembler-not "\\.data" { target tls_native } } } +// { dg-final { scan-assembler-not "\\.data" { target tls_native xfail powerpc-*-aix* } } } extern int&& ir; #pragma omp threadprivate (ir) diff --git a/gcc/testsuite/g++.dg/template/linkage1.C b/gcc/testsuite/g++.dg/template/linkage1.C index 02aa9672963..ac4d30b131a 100644 --- a/gcc/testsuite/g++.dg/template/linkage1.C +++ b/gcc/testsuite/g++.dg/template/linkage1.C @@ -1,7 +1,7 @@ // PR c++/50372 // Test that a template instantiation has the same linkage as its argument. // { dg-final { scan-assembler "(weak|glob)\[^\n\]*_Z3fooIXadL_Z13external_funcvEEEvv" } } -// { dg-final { scan-assembler-not "(weak|glob)\[^\n\]*_Z3fooIXadL_ZL11static_funcvEEEvv" } } +// { dg-final { scan-assembler-not "(weak|glob)\[^\n\]*_Z3fooIXadL_ZL11static_funcvEEEvv" { xfail powerpc-*-aix* } } } template void foo() { } diff --git a/gcc/testsuite/g++.dg/tls/thread_local1.C b/gcc/testsuite/g++.dg/tls/thread_local1.C index 67bde5549de..e05187912fe 100644 --- a/gcc/testsuite/g++.dg/tls/thread_local1.C +++ b/gcc/testsuite/g++.dg/tls/thread_local1.C @@ -7,7 +7,7 @@ // simultaneous execution. // { dg-final { scan-assembler-not "cxa_guard" } } // The guard should be TLS, not local common. -// { dg-final { scan-assembler-not "\.comm" } } +// { dg-final { scan-assembler-not "\.comm" { xfail powerpc-*-aix* } } } struct A { diff --git a/gcc/testsuite/g++.dg/tls/thread_local7.C b/gcc/testsuite/g++.dg/tls/thread_local7.C index 3cb02dd51fc..aaac6c16a52 100644 --- a/gcc/testsuite/g++.dg/tls/thread_local7.C +++ b/gcc/testsuite/g++.dg/tls/thread_local7.C @@ -2,7 +2,7 @@ // { dg-require-effective-target tls } // The reference temp should be TLS, not normal data. -// { dg-final { scan-assembler-not "\\.data" { target tls_native } } } +// { dg-final { scan-assembler-not "\\.data" { target tls_native xfail powerpc-*-aix* } } } void f() { diff --git a/gcc/testsuite/g++.dg/tls/thread_local7g.C b/gcc/testsuite/g++.dg/tls/thread_local7g.C index fb847ce4a06..05c0878e86f 100644 --- a/gcc/testsuite/g++.dg/tls/thread_local7g.C +++ b/gcc/testsuite/g++.dg/tls/thread_local7g.C @@ -2,7 +2,7 @@ // { dg-require-effective-target tls } // The reference temp should be TLS, not normal data. -// { dg-final { scan-assembler-not "\\.data" { target tls_native } } } +// { dg-final { scan-assembler-not "\\.data" { target tls_native xfail powerpc-*-aix* } } } thread_local int&& ir = 42; diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p755a.C b/gcc/testsuite/g++.old-deja/g++.mike/p755a.C index bc23d579e93..f2254b7a946 100644 --- a/gcc/testsuite/g++.old-deja/g++.mike/p755a.C +++ b/gcc/testsuite/g++.old-deja/g++.mike/p755a.C @@ -1,4 +1,4 @@ -// { dg-do run } +// { dg-do run { xfail powerpc-*-aix* } } // It checks to see if you can define your own global delete operator. // prms-id: 755 diff --git a/gcc/testsuite/gcc.c-torture/execute/eeprof-1.c b/gcc/testsuite/gcc.c-torture/execute/eeprof-1.c index c2a9ff65f18..85c262b5ca9 100644 --- a/gcc/testsuite/gcc.c-torture/execute/eeprof-1.c +++ b/gcc/testsuite/gcc.c-torture/execute/eeprof-1.c @@ -1,6 +1,6 @@ /* { dg-require-effective-target return_address } */ /* { dg-options "-finstrument-functions" } */ -/* { dg-xfail-if "" { powerpc-ibm-aix* } "*" "" } */ +/* { dg-xfail-run-if "" { powerpc-ibm-aix* } "*" "" } */ extern void abort (void); diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index a9d8e6c09da..60ff3463d0e 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -596,7 +596,7 @@ proc add_options_for_tls { flags } { int f (void) { return i; } void g (int j) { i = j; } }] } { - return "$flags -pthread" + return "-pthread [g++_link_flags [get_multilibs "-pthread"] ] $flags " } return $flags } -- 2.30.2