* gcc.dg/pr31344.c: Move to ...

	* gcc.dg/dfp/pr31344.c: ... here.
	* gcc.dg/sibcall-6.c: Simplify dg-skip-if directive.
	* gcc.dg/20050503-1.c: Ditto.
	* gcc.dg/20050111-1.c: Simplify i?86 and x86_64 dg-options directive.
	* gcc.dg/20061127-1.c: Compile only for fpic targets.
	* gcc.dg/20060801-1.c: Ditto.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127889 138bc75d-0d04-0410-961f-82ee72b054a4

21 files changed, 24 insertions, 25 deletions

diff --git a/gcc/testsuite/gcc.dg/20050111-1.c b/gcc/testsuite/gcc.dg/20050111-1.c
index 0cc4b7e195f..7cf04e806d6 100644
--- a/gcc/testsuite/gcc.dg/20050111-1.c
+++ b/gcc/testsuite/gcc.dg/20050111-1.c
@@ -1,10 +1,7 @@
 /* PR middle-end/19084, rtl-optimization/19348 */
 /* { dg-do compile } */
-/* The following ensures that this test is compiled with -O2, unless
-   on i?86 or x86_64 with -m32 option.  */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -march=i686" { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O2" { target lp64 } } */
+/* { dg-options "-O2 -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 unsigned int
 foo (unsigned long long x)
diff --git a/gcc/testsuite/gcc.dg/20050503-1.c b/gcc/testsuite/gcc.dg/20050503-1.c
index 1ab93cad7bf..a6c6fa15fa8 100644
--- a/gcc/testsuite/gcc.dg/20050503-1.c
+++ b/gcc/testsuite/gcc.dg/20050503-1.c
@@ -2,7 +2,7 @@
    Test whether tail call information is propagated through builtin
    expanders.  */
 /* { dg-do compile } */
-/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && ilp32 } { "-fpic" "-fPIC" } { "" } } */
+/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && { ilp32 && fpic } } { "*" } { "" } } */
 /* { dg-options "-O2" } */
 
 typedef __SIZE_TYPE__ size_t;
diff --git a/gcc/testsuite/gcc.dg/20060801-1.c b/gcc/testsuite/gcc.dg/20060801-1.c
index 26cc7c21d85..c036acbec80 100644
--- a/gcc/testsuite/gcc.dg/20060801-1.c
+++ b/gcc/testsuite/gcc.dg/20060801-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { lp64 } } } */
+/* { dg-do compile { target fpic } } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-fPIC" } */
 char *ptr = 0;
 char array[100];
diff --git a/gcc/testsuite/gcc.dg/20061127-1.c b/gcc/testsuite/gcc.dg/20061127-1.c
index ec94dc8c3f8..0b70a5ae2b6 100644
--- a/gcc/testsuite/gcc.dg/20061127-1.c
+++ b/gcc/testsuite/gcc.dg/20061127-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target lp64 } } */
+/* { dg-do compile { target fpic } } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O1 -fPIC" } */
 
 /* PR target/29319 */
diff --git a/gcc/testsuite/gcc.dg/arm-asm.c b/gcc/testsuite/gcc.dg/arm-asm.c
index dd99c68553f..1187d9eb466 100644
--- a/gcc/testsuite/gcc.dg/arm-asm.c
+++ b/gcc/testsuite/gcc.dg/arm-asm.c
@@ -1,6 +1,6 @@
 /* ARM and Thumb asm statements should be able to access the constant
    pool.  */
-/* { dg-do compile { target arm*-*-* strongarm*-*-* xscale*-*-*} } */
+/* { dg-do compile { target arm*-*-* strongarm*-*-* xscale*-*-* } } */
 extern unsigned x[];
 unsigned *trapTable()
 {
diff --git a/gcc/testsuite/gcc.dg/attr-isr-trap_exit.c b/gcc/testsuite/gcc.dg/attr-isr-trap_exit.c
index 880db37ce73..7ea24c494f0 100644
--- a/gcc/testsuite/gcc.dg/attr-isr-trap_exit.c
+++ b/gcc/testsuite/gcc.dg/attr-isr-trap_exit.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target sh-*-* sh[1234ble]*-*-*} } */
+/* { dg-do compile { target sh-*-* sh[1234ble]*-*-* } } */
 /* { dg-options "-O" } */
 /* Check that trapa / interrput_handler attributes can paired in
    either order.  */
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-2.c b/gcc/testsuite/gcc.dg/c99-tgmath-2.c
index d162d4ac9ad..22435f3f9a4 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-2.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-2.c
@@ -11,4 +11,4 @@ float foo(float x)
   return sin(x);
 }
 
-/* {dg-final {scan-assembler "sinf" } } */
+/* { dg-final { scan-assembler "sinf" } } */
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-3.c b/gcc/testsuite/gcc.dg/c99-tgmath-3.c
index 4d0de1ee56b..d3eaca15aee 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-3.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-3.c
@@ -11,4 +11,4 @@ complex double foo(complex double x)
   return exp(x);
 }
 
-/* {dg-final {scan-assembler "cexp" } } */
+/* { dg-final { scan-assembler "cexp" } } */
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-4.c b/gcc/testsuite/gcc.dg/c99-tgmath-4.c
index e9e490bdec7..7d40449a773 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-4.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-4.c
@@ -11,4 +11,4 @@ complex double foo(complex float x, float y)
   return pow(x, y);
 }
 
-/* {dg-final {scan-assembler "cpowf" } } */
+/* { dg-final { scan-assembler "cpowf" } } */
diff --git a/gcc/testsuite/gcc.dg/cast-lvalue-2.c b/gcc/testsuite/gcc.dg/cast-lvalue-2.c
index ed6a2e69fe8..d4db4bd6ff3 100644
--- a/gcc/testsuite/gcc.dg/cast-lvalue-2.c
+++ b/gcc/testsuite/gcc.dg/cast-lvalue-2.c
@@ -10,4 +10,4 @@ foo (void)
 {
   (int) x = 1; /* { dg-bogus "warning" "warning in place of error" } */
 }
-/* { dg-error "lvalue" "cast as lvalue" { target *-*-*} 11 } */
+/* { dg-error "lvalue" "cast as lvalue" { target *-*-* } 11 } */
diff --git a/gcc/testsuite/gcc.dg/cleanup-11.c b/gcc/testsuite/gcc.dg/cleanup-11.c
index 6e145c5f31c..d0c78d577b7 100644
--- a/gcc/testsuite/gcc.dg/cleanup-11.c
+++ b/gcc/testsuite/gcc.dg/cleanup-11.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target hppa*-*-hpux* *-*-linux* powerpc*-*-darwin* *-*-darwin[912]*} } */
+/* { dg-do run { target hppa*-*-hpux* *-*-linux* powerpc*-*-darwin* *-*-darwin[912]* } } */
 /* { dg-options "-fexceptions -fnon-call-exceptions -O2" } */
 /* Verify that cleanups work with exception handling through realtime signal
    frames on alternate stack.  */
diff --git a/gcc/testsuite/gcc.dg/cleanup-8.c b/gcc/testsuite/gcc.dg/cleanup-8.c
index 6f3ff6c511b..d2335606a21 100644
--- a/gcc/testsuite/gcc.dg/cleanup-8.c
+++ b/gcc/testsuite/gcc.dg/cleanup-8.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target hppa*-*-hpux* *-*-linux* powerpc*-*-darwin* *-*-darwin[912]*} } */
+/* { dg-do run { target hppa*-*-hpux* *-*-linux* powerpc*-*-darwin* *-*-darwin[912]* } } */
 /* { dg-options "-fexceptions -fnon-call-exceptions -O2" } */
 /* Verify that cleanups work with exception handling through signal
    frames.  */
diff --git a/gcc/testsuite/gcc.dg/cleanup-9.c b/gcc/testsuite/gcc.dg/cleanup-9.c
index 93d0463aab8..b73125ace96 100644
--- a/gcc/testsuite/gcc.dg/cleanup-9.c
+++ b/gcc/testsuite/gcc.dg/cleanup-9.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target hppa*-*-hpux* *-*-linux* powerpc*-*-darwin* *-*-darwin[912]*} } */
+/* { dg-do run { target hppa*-*-hpux* *-*-linux* powerpc*-*-darwin* *-*-darwin[912]* } } */
 /* { dg-options "-fexceptions -fnon-call-exceptions -O2" } */
 /* Verify that cleanups work with exception handling through realtime
    signal frames.  */
diff --git a/gcc/testsuite/gcc.dg/const-float128-ped.c b/gcc/testsuite/gcc.dg/const-float128-ped.c
index 52f0525dcd3..86a630cf951 100644
--- a/gcc/testsuite/gcc.dg/const-float128-ped.c
+++ b/gcc/testsuite/gcc.dg/const-float128-ped.c
@@ -1,5 +1,5 @@
 /* Test 'q' suffix with -pedantic on __float128 type constants.  */
-/* { dg-do compile { target { ia64-*-* || { { i?86-*-* x86_64-*-*} && lp64 } } } } */
+/* { dg-do compile { target { ia64-*-* || { { i?86-*-* x86_64-*-* } && lp64 } } } } */
 /* { dg-options "-pedantic" } */
 
 __float128 a = 123.456789q; /* { dg-warning "non-standard suffix on floating constant" } */
diff --git a/gcc/testsuite/gcc.dg/const-float128.c b/gcc/testsuite/gcc.dg/const-float128.c
index 1797e08bc30..146e0c9c986 100644
--- a/gcc/testsuite/gcc.dg/const-float128.c
+++ b/gcc/testsuite/gcc.dg/const-float128.c
@@ -1,5 +1,5 @@
 /* Test 'q' and 'Q' suffixes on __float128 type constants.  */
-/* { dg-do compile { target { ia64-*-* || { { i?86-*-* x86_64-*-*} && lp64 } } } } */
+/* { dg-do compile { target { ia64-*-* || { { i?86-*-* x86_64-*-* } && lp64 } } } } */
 /* { dg-options "" } */
 
 __float128 a = 123.456789q;
diff --git a/gcc/testsuite/gcc.dg/pr31344.c b/gcc/testsuite/gcc.dg/dfp/pr31344.c
index a01439b7e0e..de76a72f937 100644
--- a/gcc/testsuite/gcc.dg/pr31344.c
+++ b/gcc/testsuite/gcc.dg/dfp/pr31344.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target dfp } } */
+/* { dg-do compile } */
 /* { dg-options "-O -std=gnu99 -mtune=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-options "-O -std=gnu99" } */
 
diff --git a/gcc/testsuite/gcc.dg/h8300-ice2.c b/gcc/testsuite/gcc.dg/h8300-ice2.c
index 5dd746a42e9..951c15deb92 100644
--- a/gcc/testsuite/gcc.dg/h8300-ice2.c
+++ b/gcc/testsuite/gcc.dg/h8300-ice2.c
@@ -1,4 +1,4 @@
-/*{dg-do compile target {h8300-*-*}} */
+/* { dg-do compile target { h8300-*-* } } */
 /* ICE for signed/unsigned long and signed char comparison */
 int main()
 {
diff --git a/gcc/testsuite/gcc.dg/pragma-isr-trap_exit.c b/gcc/testsuite/gcc.dg/pragma-isr-trap_exit.c
index 9b3233a36b5..00a0608ccb4 100644
--- a/gcc/testsuite/gcc.dg/pragma-isr-trap_exit.c
+++ b/gcc/testsuite/gcc.dg/pragma-isr-trap_exit.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target sh-*-* sh[1234ble]*-*-*} } */
+/* { dg-do compile { target sh-*-* sh[1234ble]*-*-* } } */
 /* { dg-options "-O" } */
 /* This test case will check whether trapa is generated only for isr.  */
 #pragma interrupt
diff --git a/gcc/testsuite/gcc.dg/pragma-isr.c b/gcc/testsuite/gcc.dg/pragma-isr.c
index 07d8fa7f1f9..e7565a68245 100644
--- a/gcc/testsuite/gcc.dg/pragma-isr.c
+++ b/gcc/testsuite/gcc.dg/pragma-isr.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target h8300-*-* sh-*-* sh[1234ble]*-*-*} } */
+/* { dg-do compile { target h8300-*-* sh-*-* sh[1234ble]*-*-* } } */
 /* { dg-options "-O3" } */
 /* Test case will check whether rte is generated for two ISRs*/
 extern void foo();
diff --git a/gcc/testsuite/gcc.dg/pragma-isr2.c b/gcc/testsuite/gcc.dg/pragma-isr2.c
index 7dba7f9bf61..3e2e4bb38ba 100644
--- a/gcc/testsuite/gcc.dg/pragma-isr2.c
+++ b/gcc/testsuite/gcc.dg/pragma-isr2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target h8300-*-* sh-*-* sh[1234ble]*-*-*} } */
+/* { dg-do compile { target h8300-*-* sh-*-* sh[1234ble]*-*-* } } */
 /* { dg-options "-O" } */
 /* This test case will check whether rte is generated only for isr.  */
 #pragma interrupt
diff --git a/gcc/testsuite/gcc.dg/sibcall-6.c b/gcc/testsuite/gcc.dg/sibcall-6.c
index ca26400ba33..f57f9c43781 100644
--- a/gcc/testsuite/gcc.dg/sibcall-6.c
+++ b/gcc/testsuite/gcc.dg/sibcall-6.c
@@ -6,8 +6,8 @@
    Copyright (C) 2002 Free Software Foundation Inc.
    Contributed by Andreas Bauer <baueran@in.tum.de>  */
 
-/* { dg-do run { target i?86-*-* s390*-*-* x86_64-*-*} } */
-/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && ilp32 } { "-fpic" "-fPIC" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* s390*-*-* } } */
+/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && { ilp32 && fpic } } { "*" } { "" } } */
 /* { dg-options "-O2 -foptimize-sibling-calls" } */
 
 extern void abort (void);