Patchwork [committed] Fix dg-require-effective-targets for thr-init* tests

login
register
mail settings
Submitter Richard Sandiford
Date Oct. 31, 2010, 2:39 p.m.
Message ID <87aaluifyv.fsf@firetop.home>
Download mbox | patch
Permalink /patch/69715/
State New
Headers show

Comments

Richard Sandiford - Oct. 31, 2010, 2:39 p.m.
Many of the thr-init-* tests are execution tests.  Those tests should
therefore require tls_runtime rather than plain tls.  Also, a couple
of tests had the dg-do and the dg-require-effective-target in the
wrong order, making the dg-r-e-t ineffective.

Tested on mipsisa64-elf (where the tests were failing) and on
mips64-linux-gnu.  Applied as obvious.

Richard


gcc/testsuite/
	* gcc.dg/tls/thr-init-1.c: Fix order of dg-do.
	* gcc.dg/tls/thr-init-2.c: Likewise.  Require tls_runtime rather
	than tls.
	* gcc.dg/torture/tls/thr-init-1.c: Require tls_runtime rather than tls.
	* gcc.dg/torture/tls/thr-init-2.c: Likewise.
	* objc.dg/torture/tls/thr-init.m: Likewise.
	* objc.dg/torture/tls/thr-init-2.m: Likewise.
	* objc.dg/torture/tls/thr-init-3.m: Likewise.

Patch

Index: gcc/testsuite/gcc.dg/tls/thr-init-1.c
===================================================================
--- gcc/testsuite/gcc.dg/tls/thr-init-1.c	2010-10-31 14:32:53.000000000 +0000
+++ gcc/testsuite/gcc.dg/tls/thr-init-1.c	2010-10-31 14:32:55.000000000 +0000
@@ -1,5 +1,5 @@ 
-/* { dg-require-effective-target tls } */
 /* { dg-do compile } */
+/* { dg-require-effective-target tls } */
 
 static __thread int fstat ;
 static __thread int fstat = 1 ;
Index: gcc/testsuite/gcc.dg/tls/thr-init-2.c
===================================================================
--- gcc/testsuite/gcc.dg/tls/thr-init-2.c	2010-10-31 14:32:47.000000000 +0000
+++ gcc/testsuite/gcc.dg/tls/thr-init-2.c	2010-10-31 14:32:50.000000000 +0000
@@ -1,5 +1,5 @@ 
-/* { dg-require-effective-target tls } */
 /* { dg-do run } */
+/* { dg-require-effective-target tls_runtime } */
 /* { dg-add-options tls } */
 
 extern void abort() ;
Index: gcc/testsuite/gcc.dg/torture/tls/thr-init-1.c
===================================================================
--- gcc/testsuite/gcc.dg/torture/tls/thr-init-1.c	2010-10-31 14:32:47.000000000 +0000
+++ gcc/testsuite/gcc.dg/torture/tls/thr-init-1.c	2010-10-31 14:32:50.000000000 +0000
@@ -1,5 +1,5 @@ 
 /* { dg-do run } */
-/* { dg-require-effective-target tls } */
+/* { dg-require-effective-target tls_runtime } */
 /* { dg-add-options tls } */
 
 extern int printf (char *,...);
Index: gcc/testsuite/gcc.dg/torture/tls/thr-init-2.c
===================================================================
--- gcc/testsuite/gcc.dg/torture/tls/thr-init-2.c	2010-10-31 14:32:47.000000000 +0000
+++ gcc/testsuite/gcc.dg/torture/tls/thr-init-2.c	2010-10-31 14:32:50.000000000 +0000
@@ -1,5 +1,5 @@ 
 /* { dg-do run } */
-/* { dg-require-effective-target tls } */
+/* { dg-require-effective-target tls_runtime } */
 /* { dg-add-options tls } */
 
 extern int printf (char *,...);
Index: gcc/testsuite/objc.dg/torture/tls/thr-init.m
===================================================================
--- gcc/testsuite/objc.dg/torture/tls/thr-init.m	2010-10-31 14:32:46.000000000 +0000
+++ gcc/testsuite/objc.dg/torture/tls/thr-init.m	2010-10-31 14:32:50.000000000 +0000
@@ -1,5 +1,5 @@ 
 /* { dg-do run } */
-/* { dg-require-effective-target tls } */
+/* { dg-require-effective-target tls_runtime } */
 /* { dg-add-options tls } */
 
 extern void _exit(int);
Index: gcc/testsuite/objc.dg/torture/tls/thr-init-2.m
===================================================================
--- gcc/testsuite/objc.dg/torture/tls/thr-init-2.m	2010-10-31 14:32:46.000000000 +0000
+++ gcc/testsuite/objc.dg/torture/tls/thr-init-2.m	2010-10-31 14:32:50.000000000 +0000
@@ -1,5 +1,5 @@ 
 // { dg-do run }
-// { dg-require-effective-target tls }
+// { dg-require-effective-target tls_runtime }
 // { dg-add-options tls }
 
 extern void _exit(int);
Index: gcc/testsuite/objc.dg/torture/tls/thr-init-3.m
===================================================================
--- gcc/testsuite/objc.dg/torture/tls/thr-init-3.m	2010-10-31 14:32:47.000000000 +0000
+++ gcc/testsuite/objc.dg/torture/tls/thr-init-3.m	2010-10-31 14:32:50.000000000 +0000
@@ -1,5 +1,5 @@ 
 /* { dg-do run } */
-/* { dg-require-effective-target tls } */
+/* { dg-require-effective-target tls_runtime } */
 /* { dg-add-options tls } */
 /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
 /* { dg-additional-sources "../../../objc-obj-c++-shared/Object1.m" } */