re PR testsuite/20772 (x86 tests should run on both i?86 and x86_64)

	PR testsuite/20772
	* g++.dg/abi/mangle24.C, g++.dg/abi/mangle25.C,
	g++.dg/ext/vector2.C, g++.dg/opt/longbranch2.C, g++.dg/opt/mmx1.C,
	g++.dg/opt/reg-stack4.C, gcc.dg/20020108-1.c, gcc.dg/20020122-2.c,
	gcc.dg/20020122-3.c, gcc.dg/20020206-1.c, gcc.dg/20020310-1.c,
	gcc.dg/20020411-1.c, gcc.dg/20020418-2.c, gcc.dg/20020426-2.c,
	gcc.dg/20020517-1.c, gcc.dg/20030204-1.c, gcc.dg/20030826-2.c,
	gcc.dg/20031202-1.c, gcc.dg/format/unnamed-1.c, gcc.dg/setjmp-2.c,
	gcc.dg/short-compare-1.c, gcc.dg/short-compare-2.c,
	gcc.dg/tls/opt-1.c, gcc.dg/tls/opt-2.c,
	gcc.dg/torture/fp-int-convert-float128-timode.c,
	gcc.dg/torture/fp-int-convert-float128.c,
	gcc.dg/torture/fp-int-convert-float80-timode.c,
	gcc.dg/torture/fp-int-convert-float80.c, gcc.dg/unroll-1.c,
	gcc.target/i386/20030926-1.c: Merge i?86 and x86_64 cases.

	* gcc.dg/tls/opt-1.c: Require effective target fpic.

From-SVN: r108348

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2310b1552900733fc30cc29da5176438a370f668..88cbc84e754590ff35cc32d4ca9386ca82cf17a0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,23 @@
+2005-12-10  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       PR testsuite/20772
+       * g++.dg/abi/mangle24.C, g++.dg/abi/mangle25.C,
+       g++.dg/ext/vector2.C, g++.dg/opt/longbranch2.C, g++.dg/opt/mmx1.C,
+       g++.dg/opt/reg-stack4.C, gcc.dg/20020108-1.c, gcc.dg/20020122-2.c,
+       gcc.dg/20020122-3.c, gcc.dg/20020206-1.c, gcc.dg/20020310-1.c,
+       gcc.dg/20020411-1.c, gcc.dg/20020418-2.c, gcc.dg/20020426-2.c,
+       gcc.dg/20020517-1.c, gcc.dg/20030204-1.c, gcc.dg/20030826-2.c,
+       gcc.dg/20031202-1.c, gcc.dg/format/unnamed-1.c, gcc.dg/setjmp-2.c,
+       gcc.dg/short-compare-1.c, gcc.dg/short-compare-2.c,
+       gcc.dg/tls/opt-1.c, gcc.dg/tls/opt-2.c,
+       gcc.dg/torture/fp-int-convert-float128-timode.c,
+       gcc.dg/torture/fp-int-convert-float128.c,
+       gcc.dg/torture/fp-int-convert-float80-timode.c,
+       gcc.dg/torture/fp-int-convert-float80.c, gcc.dg/unroll-1.c,
+       gcc.target/i386/20030926-1.c: Merge i?86 and x86_64 cases.
+
+       * gcc.dg/tls/opt-1.c: Require effective target fpic.
+
 2005-12-10  Hans-Peter Nilsson  <hp@axis.com>
 
        * g++.old-deja/g++.other/comdat5.C: Gate on target fpic.
@@ -85,6 +105,7 @@
 
 2005-12-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
+       PR testsuite/20772
        * g++.dg/other/i386-1.C, gcc.c-torture/execute/990413-2.x,
        gcc.dg/torture/pr18582-1.c,
        gcc.target/i386/attributes-error.c: Also test on x86_64.

diff --git a/gcc/testsuite/g++.dg/abi/mangle24.C b/gcc/testsuite/g++.dg/abi/mangle24.C
index b7c777bff5287a69f16345476190fba5779e6a63..16aa2ea8e59290ff08984effa0b877c2f6f18bed 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/mangle24.C
+++ b/gcc/testsuite/g++.dg/abi/mangle24.C
@@ -5,8 +5,7 @@
 // Origin: Joseph Myers <joseph@codesourcery.com>
 // { dg-do compile { target i?86-*-* x86_64-*-* ia64-*-* } } */
 // { dg-options "" } */
-// { dg-options "-mmmx" { target { i?86-*-* && ilp32 } } } */
-// { dg-options "-mmmx" { target { x86_64-*-* && ilp32 } } } */
+// { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 // { dg-final { scan-assembler "_Z1fe" { target i?86-*-* x86_64-*-* } } } */
 // { dg-final { scan-assembler "_Z1fe" { target { ia64-*-* && { ! "ia64-*-hpux*" } } } } } */
 // { dg-final { scan-assembler "_Z1fu9__float80" { target ia64-*-hpux* } } } */

diff --git a/gcc/testsuite/g++.dg/abi/mangle25.C b/gcc/testsuite/g++.dg/abi/mangle25.C
index d469f41c6b5d50c9472f5991a74af02d464609dd..b57b7dac83afb96c02463454961dcb3b54d3f006 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/mangle25.C
+++ b/gcc/testsuite/g++.dg/abi/mangle25.C
@@ -6,8 +6,7 @@
 // Origin: Joseph Myers <joseph@codesourcery.com>
 // { dg-do compile { target i?86-*-* x86_64-*-* ia64-*-* } } */
 // { dg-options "" } */
-// { dg-options "-mmmx" { target { i?86-*-* && ilp32 } } } */
-// { dg-options "-mmmx" { target { x86_64-*-* && ilp32 } } } */
+// { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 // { dg-final { scan-assembler "_Z1fg" { target i?86-*-* x86_64-*-* } } } */
 // { dg-final { scan-assembler "_Z1fg" { target { ia64-*-* && { ! "ia64-*-hpux*" } } } } } */
 // { dg-final { scan-assembler "_Z1fe" { target ia64-*-hpux* } } } */

diff --git a/gcc/testsuite/g++.dg/ext/vector2.C b/gcc/testsuite/g++.dg/ext/vector2.C
index d93257b19699810ab4dc36283464ca66f0ba9bb9..27dabbd16ed3a5451be581814b9eb4162c6098a5 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/vector2.C
+++ b/gcc/testsuite/g++.dg/ext/vector2.C
@@ -1,7 +1,6 @@
 // PR c++/23337; caused an ICE in component_ref_field_offset
 // { dg-options "" }
-// { dg-options "-mmmx" { target { i?86-*-* && ilp32 } } } */
-// { dg-options "-mmmx" { target { x86_64-*-* && ilp32 } } } */
+// { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 typedef int vec __attribute__ ((vector_size (8)));
 extern int bar (vec);
 int

diff --git a/gcc/testsuite/g++.dg/opt/longbranch2.C b/gcc/testsuite/g++.dg/opt/longbranch2.C
index dbc8a1d94d2360442b2c3168bcd62dbd83d2d2bb..f2a3a781788e3b2a0552a313be3315dcc6a547be 100644 (file)
--- a/gcc/testsuite/g++.dg/opt/longbranch2.C
+++ b/gcc/testsuite/g++.dg/opt/longbranch2.C
@@ -2,8 +2,7 @@
 // Originator: thor@math.tu-berlin.de
 
 // { dg-do compile }
-// { dg-options "-O3 -funroll-loops -mtune=k6 -fomit-frame-pointer" { target { i?86-*-* && ilp32 } } }
-// { dg-options "-O3 -funroll-loops -mtune=k6 -fomit-frame-pointer" { target { x86_64-*-* && ilp32 } } }
+// { dg-options "-O3 -funroll-loops -mtune=k6 -fomit-frame-pointer" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
 
 
 // This used to fail to assemble because of an out-of-range 'loop' instructions.

diff --git a/gcc/testsuite/g++.dg/opt/mmx1.C b/gcc/testsuite/g++.dg/opt/mmx1.C
index f13b2f844af6ab0d11860c5837182490fd3bd705..93e3fe7f81451efcefba8b8859652ad600899ef5 100644 (file)
--- a/gcc/testsuite/g++.dg/opt/mmx1.C
+++ b/gcc/testsuite/g++.dg/opt/mmx1.C
@@ -3,8 +3,7 @@
 // mmx -> mmx register moves.
 // { dg-do compile }
 // { dg-options "-O2" }
-// { dg-options "-fno-exceptions -O2 -mmmx -fPIC" { target { i?86-*-*  && ilp32 }  } }
-// { dg-options "-fno-exceptions -O2 -mmmx -fPIC" { target { x86_64-*-* && ilp32 } } }
+// { dg-options "-fno-exceptions -O2 -mmmx -fPIC" { target { { i?86-*-* x86_64-*-* } && ilp32 }  } }
 
 struct A {
   unsigned a0;

diff --git a/gcc/testsuite/g++.dg/opt/reg-stack4.C b/gcc/testsuite/g++.dg/opt/reg-stack4.C
index 9d52845db646ab42c3ed1146798686d63e5042d1..b1b7434163a8fd36fb1f5fab144e18ee467f381e 100644 (file)
--- a/gcc/testsuite/g++.dg/opt/reg-stack4.C
+++ b/gcc/testsuite/g++.dg/opt/reg-stack4.C
@@ -5,8 +5,7 @@
 // deleted a valid edge.
 
 // { dg-do compile }
-// { dg-options "-mtune=i586 -O2" { target { i?86-*-* && ilp32 } } }
-// { dg-options "-mtune=i586 -O2" { target { x86_64-*-* && ilp32 } } }
+// { dg-options "-mtune=i586 -O2" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
 
 struct array {
   double data;

diff --git a/gcc/testsuite/gcc.dg/20020108-1.c b/gcc/testsuite/gcc.dg/20020108-1.c
index 32d24fdca3e4d9fd6e9433fc697b9ecf6983310b..d61944c590ee7a4e134056274deaaac240a306f0 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020108-1.c
+++ b/gcc/testsuite/gcc.dg/20020108-1.c
@@ -5,8 +5,7 @@
    is not valid general_operand in HImode.  */
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 
 void

diff --git a/gcc/testsuite/gcc.dg/20020122-2.c b/gcc/testsuite/gcc.dg/20020122-2.c
index 5dca0dba4c46393f2bef80a81efe447799d05885..275dceed7245b3963ec2c3b0219ae91f4a7f5c86 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020122-2.c
+++ b/gcc/testsuite/gcc.dg/20020122-2.c
@@ -3,8 +3,7 @@
   
 /* { dg-do compile } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */
-/* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern int access( char* );
 extern int a();

diff --git a/gcc/testsuite/gcc.dg/20020122-3.c b/gcc/testsuite/gcc.dg/20020122-3.c
index bcf257527c08ef25a48695e22df7c63b2b49c8a4..28f68719ed19a69ff129178ef60d34d2d07b2723 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020122-3.c
+++ b/gcc/testsuite/gcc.dg/20020122-3.c
@@ -4,8 +4,7 @@
 
 /* { dg-do compile } */
 /* { dg-options "-Os -fprefetch-loop-arrays -w" } */
-/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 int foo (int *p, int n)
 {

diff --git a/gcc/testsuite/gcc.dg/20020206-1.c b/gcc/testsuite/gcc.dg/20020206-1.c
index 26c36c43b8e29127bf1b9fc81628e3dc81a8dcf2..837718b6c4c73e754735331fe6a4212427757e09 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020206-1.c
+++ b/gcc/testsuite/gcc.dg/20020206-1.c
@@ -4,8 +4,7 @@
 
 /* { dg-do run } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */
-/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 
 struct reload

diff --git a/gcc/testsuite/gcc.dg/20020310-1.c b/gcc/testsuite/gcc.dg/20020310-1.c
index 345199dcd7264d0112969e91f0d0d5d886ab2dd5..bdd29672bd8189e80afae89e4465b8f4009f0de1 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020310-1.c
+++ b/gcc/testsuite/gcc.dg/20020310-1.c
@@ -2,8 +2,7 @@
    This testcase was miscompiled because of an rtx sharing bug.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i586" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -mtune=i586" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -mtune=i586" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 struct A
 {

diff --git a/gcc/testsuite/gcc.dg/20020411-1.c b/gcc/testsuite/gcc.dg/20020411-1.c
index 8908c32afaf576a2225182694332c8a3f48751e2..47a8fed50952d76749d2c86b4dba1a2a2b2c45a6 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020411-1.c
+++ b/gcc/testsuite/gcc.dg/20020411-1.c
@@ -3,8 +3,7 @@
    for its mode.  */
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -march=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -march=i686" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #if __INT_MAX__ > 32767
 

diff --git a/gcc/testsuite/gcc.dg/20020418-2.c b/gcc/testsuite/gcc.dg/20020418-2.c
index 07722ce758f3c2da54a43c5f441c3805c72511c0..93688d2703090d70c63b2c9c27b1b6f7350e5652 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020418-2.c
+++ b/gcc/testsuite/gcc.dg/20020418-2.c
@@ -1,8 +1,7 @@
 /* PR optimization/6010 */
 /* { dg-do compile } */
 /* { dg-options "-O2 -funroll-all-loops" } */
-/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 void bar (float);
 

diff --git a/gcc/testsuite/gcc.dg/20020426-2.c b/gcc/testsuite/gcc.dg/20020426-2.c
index 6bb53cf598cf77465340d1cc1b09c9419bc41363..095cf51790d76c56c5553b530576c4712cf84ccb 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020426-2.c
+++ b/gcc/testsuite/gcc.dg/20020426-2.c
@@ -2,8 +2,7 @@
    Distilled from zlib sources.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-bogus "\[Uu\]nresolved symbol .(_GLOBAL_OFFSET_TABLE_|\[_.A-Za-z\]\[_.0-9A-Za-z\]*@(PLT|GOT|GOTOFF))" "PIC unsupported" { xfail *-*-netware* } 0 } */
 
 extern void exit (int);

diff --git a/gcc/testsuite/gcc.dg/20020517-1.c b/gcc/testsuite/gcc.dg/20020517-1.c
index bde20095594ba36e6d796ea49f7e86452573aa6a..032ccd23b51273743c638176f0b2aba45d5adb82 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020517-1.c
+++ b/gcc/testsuite/gcc.dg/20020517-1.c
@@ -2,8 +2,7 @@
    was not sign-extended for QImode.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #include <limits.h>
 

diff --git a/gcc/testsuite/gcc.dg/20030204-1.c b/gcc/testsuite/gcc.dg/20030204-1.c
index 0d4286c08cf7c0de794808ee2ab5e81fe77f541f..701ded28cb7f5c28ef476a4ef6168580fde6249a 100644 (file)
--- a/gcc/testsuite/gcc.dg/20030204-1.c
+++ b/gcc/testsuite/gcc.dg/20030204-1.c
@@ -1,8 +1,7 @@
 /* PR optimization/8555 */
 /* { dg-do compile } */
 /* { dg-options "-O -ffast-math -funroll-loops" } */
-/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 
 float foo (float *a, int i)

diff --git a/gcc/testsuite/gcc.dg/20030826-2.c b/gcc/testsuite/gcc.dg/20030826-2.c
index 6ad7e9a12926abb2723f0042451e34ab12b5ff10..32db09195273908a6807302814f11a86e8f85b45 100644 (file)
--- a/gcc/testsuite/gcc.dg/20030826-2.c
+++ b/gcc/testsuite/gcc.dg/20030826-2.c
@@ -1,7 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
-/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void abort (void);
 extern void exit (int);

diff --git a/gcc/testsuite/gcc.dg/20031202-1.c b/gcc/testsuite/gcc.dg/20031202-1.c
index 4290f86889b553d1c3b382b7eb0553ebcff8aacd..c7fbfe52404d6c5b7c16517a24c16c4a5e7dcbff 100644 (file)
--- a/gcc/testsuite/gcc.dg/20031202-1.c
+++ b/gcc/testsuite/gcc.dg/20031202-1.c
@@ -1,7 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void abort (void);
 extern void exit (int);

diff --git a/gcc/testsuite/gcc.dg/format/unnamed-1.c b/gcc/testsuite/gcc.dg/format/unnamed-1.c
index 11a7de0050f3389f01952871be3f18124d41a253..2d4f77cc3152bedf75c3ec8e62d29be0c6b38138 100644 (file)
--- a/gcc/testsuite/gcc.dg/format/unnamed-1.c
+++ b/gcc/testsuite/gcc.dg/format/unnamed-1.c
@@ -2,8 +2,8 @@
 /* Origin: Joseph Myers <joseph@codesourcery.com> */
 /* { dg-do compile } */
 /* { dg-options "-Wformat" } */
-/* { dg-options "-Wformat -msse" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-Wformat -msse" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-Wformat -msse" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+
 
 #include "format.h"
 

diff --git a/gcc/testsuite/gcc.dg/setjmp-2.c b/gcc/testsuite/gcc.dg/setjmp-2.c
index b44ac666145fbebb41de3ea3b95077f9b6b1d20c..8ad874d522cc01fe88e236bb11c824b9a5410ef6 100644 (file)
--- a/gcc/testsuite/gcc.dg/setjmp-2.c
+++ b/gcc/testsuite/gcc.dg/setjmp-2.c
@@ -1,9 +1,8 @@
 /* PR middle-end/17813 */
 /* Origin: Tom Hughes <tom@compton.nu> */
 /* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-options "-O -fomit-frame-pointer -march=i386" { target { i?86-*-linux* && ilp32 } } } */
-/* { dg-options "-O -fomit-frame-pointer -march=i386" { target { x86_64-*-linux* && ilp32 } } } */
+/* { dg-options "-O -fomit-frame-pointer" } */
+/* { dg-options "-O -fomit-frame-pointer -march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #include <setjmp.h>
 #include <signal.h>

diff --git a/gcc/testsuite/gcc.dg/short-compare-1.c b/gcc/testsuite/gcc.dg/short-compare-1.c
index 8c02a893347b08ac76c0ca9b17fefc64ee01187a..4c470529bc7084a13b30d38f26417b9763e5f397 100644 (file)
--- a/gcc/testsuite/gcc.dg/short-compare-1.c
+++ b/gcc/testsuite/gcc.dg/short-compare-1.c
@@ -3,8 +3,7 @@
 
 /* { dg-do run } */
 /* { dg-options "-O" } */
-/* { dg-options "-O -mtune=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void abort(void);
 

diff --git a/gcc/testsuite/gcc.dg/short-compare-2.c b/gcc/testsuite/gcc.dg/short-compare-2.c
index 1c2192e821a8417de6ce5770969bb16954e6b72f..0026a88c1ff7f23e2dbb47e188d5ba137140b93b 100644 (file)
--- a/gcc/testsuite/gcc.dg/short-compare-2.c
+++ b/gcc/testsuite/gcc.dg/short-compare-2.c
@@ -4,8 +4,7 @@
 
 /* { dg-do run } */
 /* { dg-options "-O" } */
-/* { dg-options "-O -mtune=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void abort();
 

diff --git a/gcc/testsuite/gcc.dg/tls/opt-1.c b/gcc/testsuite/gcc.dg/tls/opt-1.c
index 5bada6e0929948408f3401f67b9eb54be119fb7a..f9399e04a88e4717e7a2b7253345f597f17e10a3 100644 (file)
--- a/gcc/testsuite/gcc.dg/tls/opt-1.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-1.c
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fPIC" } */
-/* { dg-options "-O2 -fPIC -mtune=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -fPIC -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -fPIC -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-require-effective-target tls } */
+/* { dg-require-effective-target fpic } */
 
 extern __thread int thr;
 

diff --git a/gcc/testsuite/gcc.dg/tls/opt-2.c b/gcc/testsuite/gcc.dg/tls/opt-2.c
index fd781ebabd142015190aa3c681eb597560ce4379..b4cabd483478ba979d8836532dca6e26b70262a4 100644 (file)
--- a/gcc/testsuite/gcc.dg/tls/opt-2.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-2.c
@@ -4,8 +4,7 @@
    on IA-32.  */
 /* { dg-do link } */
 /* { dg-options "-O2 -ftls-model=initial-exec" } */
-/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-require-effective-target tls } */
 
 __thread int thr;

diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c
index e9538318f69d627588aa4eb4d2c7019382491495..11fa200781f60d065c2f59abe2a47953e88a627f 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c
+++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128-timode.c
@@ -4,8 +4,7 @@
 /* { dg-xfail-if "" { i?86-*-* x86_64-*-* } { "*" } { "" } } */
 /* { dg-xfail-if "" { ia64-*-* && lp64 } { "*" } { "" } } */
 /* { dg-options "" } */
-/* { dg-options "-mmmx" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-mmmx" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #include "fp-int-convert.h"
 

diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128.c b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128.c
index a78f6862e69501f0f2169ea8f08b76d7762944bc..9d610c1cb2b9da0cf32fd231bcc3be30509184b0 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128.c
+++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float128.c
@@ -3,8 +3,7 @@
 /* { dg-do run { target i?86-*-* x86_64-*-* ia64-*-* } } */
 /* { dg-xfail-if "" { i?86-*-* x86_64-*-* } { "*" } { "" } } */
 /* { dg-options "" } */
-/* { dg-options "-mmmx" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-mmmx" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #include "fp-int-convert.h"
 

diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c
index e9436ba5ed476b8f36fd82cc206f5678de3cd5e1..5b9bb706c0a9403102df3cea1ed472b00a1724b8 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c
+++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c
@@ -2,8 +2,7 @@
 /* Origin: Joseph Myers <joseph@codesourcery.com> */
 /* { dg-do run { target i?86-*-* x86_64-*-* ia64-*-* } } */
 /* { dg-options "" } */
-/* { dg-options "-mmmx" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-mmmx" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #include "fp-int-convert.h"
 

diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80.c b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80.c
index 13a924332634ea6ac300266f20fcf88b567d9c89..e2b587c0cbafab0172ae38ce2470d2fad3e0d534 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80.c
+++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80.c
@@ -2,8 +2,7 @@
 /* Origin: Joseph Myers <joseph@codesourcery.com> */
 /* { dg-do run { target i?86-*-* x86_64-*-* ia64-*-* } } */
 /* { dg-options "" } */
-/* { dg-options "-mmmx" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-mmmx" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 #include "fp-int-convert.h"
 

diff --git a/gcc/testsuite/gcc.dg/unroll-1.c b/gcc/testsuite/gcc.dg/unroll-1.c
index 7b09cd1d209bfcb2202600c38f1535bf9e88293e..5ff07e21e81c30ddb68ff1600f85563c2f340ff5 100644 (file)
--- a/gcc/testsuite/gcc.dg/unroll-1.c
+++ b/gcc/testsuite/gcc.dg/unroll-1.c
@@ -1,8 +1,7 @@
 /* PR optimization/8599 */
 /* { dg-do run } */
 /* { dg-options "-O2 -funroll-loops" } */
-/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 
 extern void abort (void);

diff --git a/gcc/testsuite/gcc.target/i386/20030926-1.c b/gcc/testsuite/gcc.target/i386/20030926-1.c
index 866ebb808d54c87333d63dd11abee32b5a05b451..8f81f31361cc6a508695ff8c83fb5fde743b95d1 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/20030926-1.c
+++ b/gcc/testsuite/gcc.target/i386/20030926-1.c
@@ -1,8 +1,7 @@
 /* PR optimization/11741  */
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -minline-all-stringops" } */
-/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 extern void *memcpy (void *, const void *, __SIZE_TYPE__);
 extern __SIZE_TYPE__ strlen (const char *);