* gcc.target/i386/*.c: Remove target selectors from dg-do directives.

* gcc.target/i386/991129-1.c, gcc.target/i386/991209-1.c, gcc.target/i386/991214-1.c, gcc.target/i386/pr26778.c, gcc.target/i386/pr27827.c, gcc.target/i386/pr30505.c, gcc.target/i386/pr32389.c, gcc.target/i386/sse-8.c, gcc.target/i386/stack-realign.c, gcc.target/i386/gcc-have-sync-compare-and-swap-1.c, gcc.target/i386/gcc-have-sync-compare-and-swap-2.c, gcc.target/i386/gcc-have-sync-compare-and-swap-3.c: Require ilp32 target using dg-require-effective-target directive. * gcc.target/i386/amd64-abi-1.c, gcc.target/i386/amd64-abi-2.c, gcc.target/i386/cleanup-2.c, gcc.target/i386/cmpxchg16b-1.c, gcc.target/i386/gcc-have-sync-compare-and-swap-4.c, gcc.target/i386/large-size-array-3.c, gcc.target/i386/pr25254.c, gcc.target/i386/pr31167.c, gcc.target/i386/pr32268.c, gcc.target/i386/pr32661-1.c, gcc.target/i386/pr32708-2.c, gcc.target/i386/pr32708-3.c, gcc.target/i386/sse4_1-pextrq.c, gcc.target/i386/sse4_1-pinsrq.c, gcc.target/i386/sse4_2-crc32q.c, gcc.target/i386/sse4_2-popcntq.c, gcc.target/i386/stack-prot-kernel.c: Require lp64 target using dg-require-effective-target directive. * gcc.target/i386/cleanup-1.c, gcc.target/i386/cleanup-2.c, gcc.target/i386/pr32268.c: Use *-*-linux* target selector in dg-do directive. * gcc.target/i386/20010202-1.c: Move from here ... * gcc.dg/20010202-1.c: ... to here. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127698 138bc75d-0d04-0410-961f-82ee72b054a4
author: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> 2007-08-22 09:59:14 +0000
committer: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> 2007-08-22 09:59:14 +0000
commit: 2741129dffdbfa5d999c0bd6567f4056921d7e97 (patch)
tree: be1e7403d7a429092b9350d16837b9a68fda52f9 /gcc/testsuite/gcc.target
parent: 375a9b935d28391dd0349319259954240fbc20e9 (diff)
download: gcc-2741129dffdbfa5d999c0bd6567f4056921d7e97.tar.gz
303 files changed, 336 insertions, 334 deletions
diff --git a/gcc/testsuite/gcc.target/i386/20000609-1.c b/gcc/testsuite/gcc.target/i386/20000609-1.c
index 5d452ac9d82..e094bba55f7 100644
--- a/gcc/testsuite/gcc.target/i386/20000609-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000609-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -ffast-math -march=i686" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20000614-1.c b/gcc/testsuite/gcc.target/i386/20000614-1.c
index 507596787a6..5e86f02e462 100644
--- a/gcc/testsuite/gcc.target/i386/20000614-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000614-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2" } */
 
 void bar(char *p)
diff --git a/gcc/testsuite/gcc.target/i386/20000614-2.c b/gcc/testsuite/gcc.target/i386/20000614-2.c
index 9eba76149dc..5b0490707c2 100644
--- a/gcc/testsuite/gcc.target/i386/20000614-2.c
+++ b/gcc/testsuite/gcc.target/i386/20000614-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-*} } */
+/* { dg-do run } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/20000720-1.c b/gcc/testsuite/gcc.target/i386/20000720-1.c
index 65bf68544b4..076a22bad76 100644
--- a/gcc/testsuite/gcc.target/i386/20000720-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000720-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mpreferred-stack-boundary=2 -march=i586 -O2 -fomit-frame-pointer" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20000807-1.c b/gcc/testsuite/gcc.target/i386/20000807-1.c
index 70b0182b054..efdf97b14a9 100644
--- a/gcc/testsuite/gcc.target/i386/20000807-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000807-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-Os -fpic" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20000904-1.c b/gcc/testsuite/gcc.target/i386/20000904-1.c
index bf00d557d71..0fbce57e1be 100644
--- a/gcc/testsuite/gcc.target/i386/20000904-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000904-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O0 -fpic" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20001127-1.c b/gcc/testsuite/gcc.target/i386/20001127-1.c
index f63d1149322..b62c6f979f7 100644
--- a/gcc/testsuite/gcc.target/i386/20001127-1.c
+++ b/gcc/testsuite/gcc.target/i386/20001127-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2" } */
 
 extern inline float bar (float x)
diff --git a/gcc/testsuite/gcc.target/i386/20010202-1.c b/gcc/testsuite/gcc.target/i386/20010202-1.c
deleted file mode 100644
index 5f789042eba..00000000000
--- a/gcc/testsuite/gcc.target/i386/20010202-1.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* { dg-do compile { target i?86-*-* sparc*-*-* x86_64-*-* } } */
-/* { dg-options "-O2" } */
-
-extern void abort (void);
-extern void exit (int);
-
-typedef enum { false, true } __attribute__ ((packed)) boolean;
-typedef struct {
-  enum {
-    A0 = 0, A1 = 1, A2 = 2
-  } __attribute__((packed)) A:3;
-  enum {
-    B0 = 0, B1 = 1, B2 = 2
-  } __attribute__((packed)) B:3;
-  boolean C:1;
-  boolean D:1;
-  unsigned char :8;
-} foo;
-foo x = { A2, B1, false, true };
-
-int main(void)
-{
-  if (sizeof (foo) != 2 || __alignof__ (foo) != 1)
-    abort ();
-
-  exit (0);
-}
diff --git a/gcc/testsuite/gcc.target/i386/20010520-1.c b/gcc/testsuite/gcc.target/i386/20010520-1.c
index 97ee32b0b82..ab4ed16ce04 100644
--- a/gcc/testsuite/gcc.target/i386/20010520-1.c
+++ b/gcc/testsuite/gcc.target/i386/20010520-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-w" } */
 
 void f ()
diff --git a/gcc/testsuite/gcc.target/i386/20011009-1.c b/gcc/testsuite/gcc.target/i386/20011009-1.c
index b78d99e997b..99173a10931 100644
--- a/gcc/testsuite/gcc.target/i386/20011009-1.c
+++ b/gcc/testsuite/gcc.target/i386/20011009-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/20011029-2.c b/gcc/testsuite/gcc.target/i386/20011029-2.c
index 07ef1a806fe..c1068de6e75 100644
--- a/gcc/testsuite/gcc.target/i386/20011029-2.c
+++ b/gcc/testsuite/gcc.target/i386/20011029-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2" } */
 
 int foo (int s)
diff --git a/gcc/testsuite/gcc.target/i386/20011107-1.c b/gcc/testsuite/gcc.target/i386/20011107-1.c
index 0d09427a0b4..3bf84e5baa1 100644
--- a/gcc/testsuite/gcc.target/i386/20011107-1.c
+++ b/gcc/testsuite/gcc.target/i386/20011107-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mtune=k6" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20011119-1.c b/gcc/testsuite/gcc.target/i386/20011119-1.c
index dc724aa60c1..6b815b05532 100644
--- a/gcc/testsuite/gcc.target/i386/20011119-1.c
+++ b/gcc/testsuite/gcc.target/i386/20011119-1.c
@@ -1,5 +1,5 @@
 /* Test for reload failing to eliminate from argp to sp.  */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-require-effective-target fpic } */
 /* { dg-skip-if "" { "*-*-*" } { "-fpic" "-fPIC" } { "" } } */
diff --git a/gcc/testsuite/gcc.target/i386/20020201-3.c b/gcc/testsuite/gcc.target/i386/20020201-3.c
index e95c44fbdfb..da700c192c3 100644
--- a/gcc/testsuite/gcc.target/i386/20020201-3.c
+++ b/gcc/testsuite/gcc.target/i386/20020201-3.c
@@ -1,6 +1,6 @@
 /* This testcase ICEd because a SFmode variable was given a MMX register
    for which there is no movsf exists.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=i686 -mmmx -fno-strict-aliasing" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20020218-1.c b/gcc/testsuite/gcc.target/i386/20020218-1.c
index bef4d66fc13..13a835ed087 100644
--- a/gcc/testsuite/gcc.target/i386/20020218-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020218-1.c
@@ -1,5 +1,5 @@
 /* Verify that X86-64 only SSE registers aren't restored on IA-32.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -msse" } */
 /* { dg-final { scan-assembler-not "xmm8" } } */
diff --git a/gcc/testsuite/gcc.target/i386/20020224-1.c b/gcc/testsuite/gcc.target/i386/20020224-1.c
index c37de2e21b7..2905719fa62 100644
--- a/gcc/testsuite/gcc.target/i386/20020224-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020224-1.c
@@ -3,7 +3,7 @@
    expected the callee to pop up the hidden return structure pointer,
    while callee was actually not poping it up (as the hidden argument
    was passed in register).  */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/20020426-1.c b/gcc/testsuite/gcc.target/i386/20020426-1.c
index 31be74712c0..57690f1d32c 100644
--- a/gcc/testsuite/gcc.target/i386/20020426-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020426-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-msoft-float -mfp-ret-in-387" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20020523-1.c b/gcc/testsuite/gcc.target/i386/20020523-1.c
index df9e0cbb9ed..c2ada6c50a1 100644
--- a/gcc/testsuite/gcc.target/i386/20020523-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020523-1.c
@@ -1,7 +1,7 @@
 /* PR target/6753
    This testcase was miscompiled because sse_mov?fcc_const0*
    patterns were missing earlyclobber.  */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-skip-if "" { ilp32 } { "-fpic" "-fPIC" } { "" } } */
 /* { dg-skip-if "PIC default" { *-*-darwin* } { "*" } { "" } } */
 /* { dg-require-effective-target ilp32 } */
diff --git a/gcc/testsuite/gcc.target/i386/20020523-2.c b/gcc/testsuite/gcc.target/i386/20020523-2.c
index 06d33d87ef2..8321530cd54 100644
--- a/gcc/testsuite/gcc.target/i386/20020523-2.c
+++ b/gcc/testsuite/gcc.target/i386/20020523-2.c
@@ -1,7 +1,7 @@
 /* PR target/6753
    This testcase was miscompiled because sse_mov?fcc_const0*
    patterns were missing earlyclobber.  */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-march=pentium3 -msse -ffast-math -O2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20020531-1.c b/gcc/testsuite/gcc.target/i386/20020531-1.c
index 9ee67b9e664..cd7cac34724 100644
--- a/gcc/testsuite/gcc.target/i386/20020531-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020531-1.c
@@ -1,7 +1,7 @@
 /* PR optimization/6842
    This testcase caused ICE when trying to optimize V8QI subreg of VOIDmode
    CONST_DOUBLE.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -mmmx" } */
 
 typedef char __v8qi __attribute__ ((vector_size (8)));
diff --git a/gcc/testsuite/gcc.target/i386/20020616-1.c b/gcc/testsuite/gcc.target/i386/20020616-1.c
index 594677031ba..5641826b483 100644
--- a/gcc/testsuite/gcc.target/i386/20020616-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020616-1.c
@@ -1,5 +1,5 @@
 /* PR opt/6722 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2" } */
 
 #if !__PIC__
diff --git a/gcc/testsuite/gcc.target/i386/20020729-1.c b/gcc/testsuite/gcc.target/i386/20020729-1.c
index eeab6985422..d4ef9bfcd2e 100644
--- a/gcc/testsuite/gcc.target/i386/20020729-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020729-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=k6" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20030217-1.c b/gcc/testsuite/gcc.target/i386/20030217-1.c
index d0cd91316c4..f19fd27fe75 100644
--- a/gcc/testsuite/gcc.target/i386/20030217-1.c
+++ b/gcc/testsuite/gcc.target/i386/20030217-1.c
@@ -1,6 +1,6 @@
 /* Test whether denormal floating point constants in hexadecimal notation
    are parsed correctly.  */
-/* { dg-do run { target i?86-*-linux* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-std=c99" } */
 
 long double d = 0x0.0000003ffffffff00000p-16357L;
diff --git a/gcc/testsuite/gcc.target/i386/20030926-1.c b/gcc/testsuite/gcc.target/i386/20030926-1.c
index 8f81f31361c..0425f2456aa 100644
--- a/gcc/testsuite/gcc.target/i386/20030926-1.c
+++ b/gcc/testsuite/gcc.target/i386/20030926-1.c
@@ -1,7 +1,7 @@
 /* PR optimization/11741  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -minline-all-stringops" } */
-/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target ilp32 } } */
 
 extern void *memcpy (void *, const void *, __SIZE_TYPE__);
 extern __SIZE_TYPE__ strlen (const char *);
diff --git a/gcc/testsuite/gcc.target/i386/20040112-1.c b/gcc/testsuite/gcc.target/i386/20040112-1.c
index 83996fe6c23..168fd2f0bc6 100644
--- a/gcc/testsuite/gcc.target/i386/20040112-1.c
+++ b/gcc/testsuite/gcc.target/i386/20040112-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2" } */
 /* { dg-final { scan-assembler "testb" } } */
 ftn (char *sp)
diff --git a/gcc/testsuite/gcc.target/i386/20050113-1.c b/gcc/testsuite/gcc.target/i386/20050113-1.c
index b1d3cecf41f..44deb30cbef 100644
--- a/gcc/testsuite/gcc.target/i386/20050113-1.c
+++ b/gcc/testsuite/gcc.target/i386/20050113-1.c
@@ -1,5 +1,5 @@
 /* PR middle-end/19164 */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-mmmx" } */
 
 typedef short int V __attribute__ ((vector_size (8)));
diff --git a/gcc/testsuite/gcc.target/i386/20060125-1.c b/gcc/testsuite/gcc.target/i386/20060125-1.c
index cbb4e65d06f..f445b7e99f0 100644
--- a/gcc/testsuite/gcc.target/i386/20060125-1.c
+++ b/gcc/testsuite/gcc.target/i386/20060125-1.c
@@ -1,5 +1,5 @@
 /* PR rtl-optimization/25703 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mtune=i486" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20060125-2.c b/gcc/testsuite/gcc.target/i386/20060125-2.c
index 7964ca1cc86..55ef839552b 100644
--- a/gcc/testsuite/gcc.target/i386/20060125-2.c
+++ b/gcc/testsuite/gcc.target/i386/20060125-2.c
@@ -1,5 +1,5 @@
 /* PR rtl-optimization/25703 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mtune=pentiumpro" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20060512-1.c b/gcc/testsuite/gcc.target/i386/20060512-1.c
index f0f0099ac6c..94c70b4e961 100644
--- a/gcc/testsuite/gcc.target/i386/20060512-1.c
+++ b/gcc/testsuite/gcc.target/i386/20060512-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-std=gnu99 -msse2" } */
 #include <emmintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/20060512-2.c b/gcc/testsuite/gcc.target/i386/20060512-2.c
index 7e6f38e6197..0e446cf899e 100644
--- a/gcc/testsuite/gcc.target/i386/20060512-2.c
+++ b/gcc/testsuite/gcc.target/i386/20060512-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-std=gnu99" } */
 int
diff --git a/gcc/testsuite/gcc.target/i386/20060512-3.c b/gcc/testsuite/gcc.target/i386/20060512-3.c
index 85472e63b63..d0fd45bce0c 100644
--- a/gcc/testsuite/gcc.target/i386/20060512-3.c
+++ b/gcc/testsuite/gcc.target/i386/20060512-3.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-std=gnu99 -msse2 -mstackrealign" } */
 #include <emmintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/20060512-4.c b/gcc/testsuite/gcc.target/i386/20060512-4.c
index 372a3b10df7..f2dd26486b6 100644
--- a/gcc/testsuite/gcc.target/i386/20060512-4.c
+++ b/gcc/testsuite/gcc.target/i386/20060512-4.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mstackrealign" } */
 int
diff --git a/gcc/testsuite/gcc.target/i386/387-1.c b/gcc/testsuite/gcc.target/i386/387-1.c
index 22830754018..2b3ca0b0610 100644
--- a/gcc/testsuite/gcc.target/i386/387-1.c
+++ b/gcc/testsuite/gcc.target/i386/387-1.c
@@ -1,5 +1,5 @@
 /* Verify that -mno-fancy-math-387 works.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -mno-fancy-math-387 -march=i386" } */
 /* { dg-final { scan-assembler "call\t(.*)sin" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-10.c b/gcc/testsuite/gcc.target/i386/387-10.c
index 150515b2a82..565f0196e88 100644
--- a/gcc/testsuite/gcc.target/i386/387-10.c
+++ b/gcc/testsuite/gcc.target/i386/387-10.c
@@ -1,5 +1,5 @@
 /* PR tree-optimization/24964 */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -mfpmath=387" } */
 
 double fabs(double x);
diff --git a/gcc/testsuite/gcc.target/i386/387-11.c b/gcc/testsuite/gcc.target/i386/387-11.c
index cb55a9337c3..03020f64fde 100644
--- a/gcc/testsuite/gcc.target/i386/387-11.c
+++ b/gcc/testsuite/gcc.target/i386/387-11.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -mfpmath=387" } */
 
 double foo(double x, double y)
diff --git a/gcc/testsuite/gcc.target/i386/387-12.c b/gcc/testsuite/gcc.target/i386/387-12.c
index c653974a2d3..6b3ce240540 100644
--- a/gcc/testsuite/gcc.target/i386/387-12.c
+++ b/gcc/testsuite/gcc.target/i386/387-12.c
@@ -1,5 +1,5 @@
 /* PR target/26915 */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/387-2.c b/gcc/testsuite/gcc.target/i386/387-2.c
index 7358866eceb..5a317efea57 100644
--- a/gcc/testsuite/gcc.target/i386/387-2.c
+++ b/gcc/testsuite/gcc.target/i386/387-2.c
@@ -1,5 +1,5 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fsin" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-3.c b/gcc/testsuite/gcc.target/i386/387-3.c
index ed80f78187d..ce11faa8f86 100644
--- a/gcc/testsuite/gcc.target/i386/387-3.c
+++ b/gcc/testsuite/gcc.target/i386/387-3.c
@@ -1,5 +1,5 @@
 /* Verify that 387 mathematical constants are recognized.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=i686" } */
 /* { dg-final { scan-assembler "fldpi" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-4.c b/gcc/testsuite/gcc.target/i386/387-4.c
index 55398275570..5617636da56 100644
--- a/gcc/testsuite/gcc.target/i386/387-4.c
+++ b/gcc/testsuite/gcc.target/i386/387-4.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=i686" } */
 /* { dg-final { scan-assembler "fldpi" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-5.c b/gcc/testsuite/gcc.target/i386/387-5.c
index dc4d470900e..0a050081780 100644
--- a/gcc/testsuite/gcc.target/i386/387-5.c
+++ b/gcc/testsuite/gcc.target/i386/387-5.c
@@ -1,5 +1,5 @@
 /* Verify that -mno-fancy-math-387 works.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -mno-fancy-math-387 -march=i386" } */
 /* { dg-final { scan-assembler "call\t(.*)atan" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-6.c b/gcc/testsuite/gcc.target/i386/387-6.c
index b3ad64dac48..bfef46ae5f5 100644
--- a/gcc/testsuite/gcc.target/i386/387-6.c
+++ b/gcc/testsuite/gcc.target/i386/387-6.c
@@ -1,5 +1,5 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fpatan" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-7.c b/gcc/testsuite/gcc.target/i386/387-7.c
index edcdac1ae3f..61c82c95eed 100644
--- a/gcc/testsuite/gcc.target/i386/387-7.c
+++ b/gcc/testsuite/gcc.target/i386/387-7.c
@@ -1,5 +1,5 @@
 /* Verify that 387 fsincos instruction is generated.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -march=i686" } */
 /* { dg-final { scan-assembler "fsincos" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-8.c b/gcc/testsuite/gcc.target/i386/387-8.c
index 578e0a38b5f..3293f560c25 100644
--- a/gcc/testsuite/gcc.target/i386/387-8.c
+++ b/gcc/testsuite/gcc.target/i386/387-8.c
@@ -1,7 +1,7 @@
 /* Verify that 387 fptan instruction is generated. Also check that
    inherent load of 1.0 is used in further calculations.  */
 
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -ffast-math -march=i686" } */
 /* { dg-final { scan-assembler "fptan" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-9.c b/gcc/testsuite/gcc.target/i386/387-9.c
index f04faa54b01..9d126aff8dd 100644
--- a/gcc/testsuite/gcc.target/i386/387-9.c
+++ b/gcc/testsuite/gcc.target/i386/387-9.c
@@ -1,5 +1,5 @@
 /* Verify that 387 fsincos instruction is generated.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -funsafe-math-optimizations -march=i686" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/3dnow-1.c b/gcc/testsuite/gcc.target/i386/3dnow-1.c
index a8dcb419c7e..d332021c547 100644
--- a/gcc/testsuite/gcc.target/i386/3dnow-1.c
+++ b/gcc/testsuite/gcc.target/i386/3dnow-1.c
@@ -1,4 +1,4 @@
-/* { dg-do assemble { target i?86-*-* x86_64-*-* } } */
+/* { dg-do assemble } */
 /* { dg-options "-O2 -Werror-implicit-function-declaration -m3dnow" } */
 
 /* Test that the intrinsics compile with optimization.  All of them are
diff --git a/gcc/testsuite/gcc.target/i386/3dnow-2.c b/gcc/testsuite/gcc.target/i386/3dnow-2.c
index d9aa7a56420..382c1432aa9 100644
--- a/gcc/testsuite/gcc.target/i386/3dnow-2.c
+++ b/gcc/testsuite/gcc.target/i386/3dnow-2.c
@@ -1,4 +1,4 @@
-/* { dg-do assemble { target i?86-*-* x86_64-*-* } } */
+/* { dg-do assemble } */
 /* { dg-options "-O0 -Werror-implicit-function-declaration -m3dnow" } */
 
 /* Test that the intrinsics compile without optimization.  All of them are
diff --git a/gcc/testsuite/gcc.target/i386/3dnowA-1.c b/gcc/testsuite/gcc.target/i386/3dnowA-1.c
index 80209b00c29..3ced01ddfc2 100644
--- a/gcc/testsuite/gcc.target/i386/3dnowA-1.c
+++ b/gcc/testsuite/gcc.target/i386/3dnowA-1.c
@@ -1,4 +1,4 @@
-/* { dg-do assemble { target i?86-*-* x86_64-*-* } } */
+/* { dg-do assemble } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -Werror-implicit-function-declaration -m3dnow -march=athlon" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/3dnowA-2.c b/gcc/testsuite/gcc.target/i386/3dnowA-2.c
index 0cce3b1318c..0c40382af7f 100644
--- a/gcc/testsuite/gcc.target/i386/3dnowA-2.c
+++ b/gcc/testsuite/gcc.target/i386/3dnowA-2.c
@@ -1,4 +1,4 @@
-/* { dg-do assemble { target i?86-*-* x86_64-*-* } } */
+/* { dg-do assemble } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O0 -Werror-implicit-function-declaration -m3dnow -march=athlon" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/980211-1.c b/gcc/testsuite/gcc.target/i386/980211-1.c
index 69c08cb8e37..ad6312b370b 100644
--- a/gcc/testsuite/gcc.target/i386/980211-1.c
+++ b/gcc/testsuite/gcc.target/i386/980211-1.c
@@ -1,6 +1,6 @@
 /* Test long double on x86 and x86-64. */
 
-/* { dg-do run { target i?86-*-* x86_64-*-*} } */
+/* { dg-do run } */
 /* { dg-options -O2 } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/980226-1.c b/gcc/testsuite/gcc.target/i386/980226-1.c
index 52ff614ed3a..d5587c71b3c 100644
--- a/gcc/testsuite/gcc.target/i386/980226-1.c
+++ b/gcc/testsuite/gcc.target/i386/980226-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options -O2 } */
 
 extern int printf (const char *, ...);
diff --git a/gcc/testsuite/gcc.target/i386/980414-1.c b/gcc/testsuite/gcc.target/i386/980414-1.c
index e179c8137c0..6a2130a591a 100644
--- a/gcc/testsuite/gcc.target/i386/980414-1.c
+++ b/gcc/testsuite/gcc.target/i386/980414-1.c
@@ -1,6 +1,6 @@
 /* Test double on x86. */
 
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options -O2 } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/980520-1.c b/gcc/testsuite/gcc.target/i386/980520-1.c
index b11f0d3a893..f4393307ca4 100644
--- a/gcc/testsuite/gcc.target/i386/980520-1.c
+++ b/gcc/testsuite/gcc.target/i386/980520-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options -O2 } */
 
 int bug(void)
diff --git a/gcc/testsuite/gcc.target/i386/980709-1.c b/gcc/testsuite/gcc.target/i386/980709-1.c
index 01b6bfe358e..595b7cbaa40 100644
--- a/gcc/testsuite/gcc.target/i386/980709-1.c
+++ b/gcc/testsuite/gcc.target/i386/980709-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options -O2 } */
 
 extern __inline__ int test_and_set_bit(int nr, volatile void * addr)
diff --git a/gcc/testsuite/gcc.target/i386/990117-1.c b/gcc/testsuite/gcc.target/i386/990117-1.c
index 24c56f2febf..3a40e7fdfca 100644
--- a/gcc/testsuite/gcc.target/i386/990117-1.c
+++ b/gcc/testsuite/gcc.target/i386/990117-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/990130-1.c b/gcc/testsuite/gcc.target/i386/990130-1.c
index 57e046b22a6..b2754fb08cf 100644
--- a/gcc/testsuite/gcc.target/i386/990130-1.c
+++ b/gcc/testsuite/gcc.target/i386/990130-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options -O0 } */
 
 typedef 	 int SItype	__attribute__ ((mode (SI)));
diff --git a/gcc/testsuite/gcc.target/i386/990213-2.c b/gcc/testsuite/gcc.target/i386/990213-2.c
index 899f3395de3..21392bfca79 100644
--- a/gcc/testsuite/gcc.target/i386/990213-2.c
+++ b/gcc/testsuite/gcc.target/i386/990213-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-fPIC" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/990214-1.c b/gcc/testsuite/gcc.target/i386/990214-1.c
index d9e401ddb89..3c203e9f75a 100644
--- a/gcc/testsuite/gcc.target/i386/990214-1.c
+++ b/gcc/testsuite/gcc.target/i386/990214-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-fPIC" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/990424-1.c b/gcc/testsuite/gcc.target/i386/990424-1.c
index 5b5af818076..95628e12fa5 100644
--- a/gcc/testsuite/gcc.target/i386/990424-1.c
+++ b/gcc/testsuite/gcc.target/i386/990424-1.c
@@ -1,7 +1,7 @@
 /* Test that stack alignment is preserved with pending_stack_adjust
    with stdcall functions.  */
 
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options -mpreferred-stack-boundary=4 } */
 
diff --git a/gcc/testsuite/gcc.target/i386/990524-1.c b/gcc/testsuite/gcc.target/i386/990524-1.c
index ee4ebd62671..7d8205cd07f 100644
--- a/gcc/testsuite/gcc.target/i386/990524-1.c
+++ b/gcc/testsuite/gcc.target/i386/990524-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/991129-1.c b/gcc/testsuite/gcc.target/i386/991129-1.c
index 489b7f987fa..d0d58e8f9e4 100644
--- a/gcc/testsuite/gcc.target/i386/991129-1.c
+++ b/gcc/testsuite/gcc.target/i386/991129-1.c
@@ -1,6 +1,7 @@
 /* Test against a problem in push_reload.  */
 
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
 unsigned long foo (unsigned long long x, unsigned long y)
diff --git a/gcc/testsuite/gcc.target/i386/991209-1.c b/gcc/testsuite/gcc.target/i386/991209-1.c
index 85e1d90d804..15a46cfc40b 100644
--- a/gcc/testsuite/gcc.target/i386/991209-1.c
+++ b/gcc/testsuite/gcc.target/i386/991209-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-ansi -pedantic" } */
 
 int foo ()
diff --git a/gcc/testsuite/gcc.target/i386/991214-1.c b/gcc/testsuite/gcc.target/i386/991214-1.c
index cfe3a9a4121..3d9a72ed027 100644
--- a/gcc/testsuite/gcc.target/i386/991214-1.c
+++ b/gcc/testsuite/gcc.target/i386/991214-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
 /* Test against a problem with the combiner substituting explicit hard reg
diff --git a/gcc/testsuite/gcc.target/i386/991230-1.c b/gcc/testsuite/gcc.target/i386/991230-1.c
index b87d0e2e3cb..a57cc98ea8e 100644
--- a/gcc/testsuite/gcc.target/i386/991230-1.c
+++ b/gcc/testsuite/gcc.target/i386/991230-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mtune=i486" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-1.c b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
index 5ce4fe151f0..d3df77a49fc 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-mno-sse" } */
 
 double foo(void) { return 0; }	/* { dg-error "SSE disabled" } */
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-2.c b/gcc/testsuite/gcc.target/i386/amd64-abi-2.c
index 2ff642de052..fefc88a4e89 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-2.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-2.c
@@ -1,5 +1,6 @@
 /* PR target/26223 */
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-mno-80387" } */
 long double foo(long double x) { return x; } /* { dg-error "x87 disabled" } */
 long double bar(long double x) { return x; }
diff --git a/gcc/testsuite/gcc.target/i386/asm-2.c b/gcc/testsuite/gcc.target/i386/asm-2.c
index 7e9ecb7797d..09a54551745 100644
--- a/gcc/testsuite/gcc.target/i386/asm-2.c
+++ b/gcc/testsuite/gcc.target/i386/asm-2.c
@@ -1,5 +1,5 @@
 /* PR opt/13862 */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/asm-3.c b/gcc/testsuite/gcc.target/i386/asm-3.c
index fb194e7995b..b687c3851c5 100644
--- a/gcc/testsuite/gcc.target/i386/asm-3.c
+++ b/gcc/testsuite/gcc.target/i386/asm-3.c
@@ -1,5 +1,5 @@
 /* PR inline-asm/6806 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2" } */
 /* { dg-skip-if "" { ilp32 } { "-fpic" "-fPIC" } { "" } } */
 /* { dg-skip-if "PIC default" { *-*-darwin* } { "*" } { "" } } */
diff --git a/gcc/testsuite/gcc.target/i386/asm-4.c b/gcc/testsuite/gcc.target/i386/asm-4.c
index 7ca0c1b3c94..b86801032bc 100644
--- a/gcc/testsuite/gcc.target/i386/asm-4.c
+++ b/gcc/testsuite/gcc.target/i386/asm-4.c
@@ -1,7 +1,7 @@
 /* Test if functions marked __attribute__((used)), but with address never
    taken in C code, don't use alternate calling convention for local
    functions on IA-32.  */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* The asm in this test uses an absolute address.  */
 /* { dg-require-effective-target nonpic } */
 /* { dg-options "-O2" } */
diff --git a/gcc/testsuite/gcc.target/i386/asm-5.c b/gcc/testsuite/gcc.target/i386/asm-5.c
index e871dd9343f..966a824b3c2 100644
--- a/gcc/testsuite/gcc.target/i386/asm-5.c
+++ b/gcc/testsuite/gcc.target/i386/asm-5.c
@@ -1,5 +1,5 @@
 /* PR inline-asm/11676 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/attributes-error.c b/gcc/testsuite/gcc.target/i386/attributes-error.c
index 7dc2d95f108..1a5b0eadee7 100644
--- a/gcc/testsuite/gcc.target/i386/attributes-error.c
+++ b/gcc/testsuite/gcc.target/i386/attributes-error.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 
 void foo1(int i, int j) __attribute__((fastcall, cdecl)); /* { dg-error "not compatible" } */
diff --git a/gcc/testsuite/gcc.target/i386/bitfield1.c b/gcc/testsuite/gcc.target/i386/bitfield1.c
index e285ba0526a..1590396c2f9 100644
--- a/gcc/testsuite/gcc.target/i386/bitfield1.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield1.c
@@ -1,5 +1,5 @@
 // Test for bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-do run }
 // { dg-require-effective-target ilp32 }
 // { dg-options "-O2" }
 // { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw*} }
diff --git a/gcc/testsuite/gcc.target/i386/bitfield2.c b/gcc/testsuite/gcc.target/i386/bitfield2.c
index 54f5c8dbfd3..d665fcb134e 100644
--- a/gcc/testsuite/gcc.target/i386/bitfield2.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield2.c
@@ -1,5 +1,5 @@
 // Test for bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-do run }
 // { dg-require-effective-target ilp32 }
 // { dg-options "-O2" }
 // { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw* } }
diff --git a/gcc/testsuite/gcc.target/i386/bitfield3.c b/gcc/testsuite/gcc.target/i386/bitfield3.c
index 111f5f28c42..139f4d46160 100644
--- a/gcc/testsuite/gcc.target/i386/bitfield3.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield3.c
@@ -1,5 +1,5 @@
 // Test for bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-do run }
 // { dg-options "-O2" }
 // { dg-options "-mno-align-double -mno-ms-bitfields" { target *-*-interix* } }
 
diff --git a/gcc/testsuite/gcc.target/i386/cadd.c b/gcc/testsuite/gcc.target/i386/cadd.c
index 2c6360b946b..7a39c67ed7a 100644
--- a/gcc/testsuite/gcc.target/i386/cadd.c
+++ b/gcc/testsuite/gcc.target/i386/cadd.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -march=k8" } */
 /* { dg-final { scan-assembler "sbb" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/call-1.c b/gcc/testsuite/gcc.target/i386/call-1.c
index 3c3d642babd..bd7c569c69d 100644
--- a/gcc/testsuite/gcc.target/i386/call-1.c
+++ b/gcc/testsuite/gcc.target/i386/call-1.c
@@ -1,6 +1,6 @@
 /* PR optimization/11304 */
 /* Originator: <manuel.serrano@sophia.inria.fr> */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O -fomit-frame-pointer" } */
 
 /* Verify that %eax is always restored after a call.  */
diff --git a/gcc/testsuite/gcc.target/i386/cleanup-1.c b/gcc/testsuite/gcc.target/i386/cleanup-1.c
index afc1e0ae85f..1a47fcb0311 100644
--- a/gcc/testsuite/gcc.target/i386/cleanup-1.c
+++ b/gcc/testsuite/gcc.target/i386/cleanup-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */
+/* { dg-do run { target *-*-linux* } } */
 /* { dg-options "-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2" } */
 /* Test complex CFA value expressions.  */
 
diff --git a/gcc/testsuite/gcc.target/i386/cleanup-2.c b/gcc/testsuite/gcc.target/i386/cleanup-2.c
index a171077f79a..2bd18025f6e 100644
--- a/gcc/testsuite/gcc.target/i386/cleanup-2.c
+++ b/gcc/testsuite/gcc.target/i386/cleanup-2.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */
+/* { dg-do run { target *-*-linux* } } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2" } */
 /* Test complex CFA value expressions.  */
 
diff --git a/gcc/testsuite/gcc.target/i386/clobbers.c b/gcc/testsuite/gcc.target/i386/clobbers.c
index e0b06032133..7e8b200c6ff 100644
--- a/gcc/testsuite/gcc.target/i386/clobbers.c
+++ b/gcc/testsuite/gcc.target/i386/clobbers.c
@@ -1,6 +1,6 @@
 /* Test asm clobbers on x86. */
 
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-skip-if "" { ilp32 } { "-fpic" "-fPIC" } { "" } } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/cmov1.c b/gcc/testsuite/gcc.target/i386/cmov1.c
index a20b21340ec..edbbda58482 100644
--- a/gcc/testsuite/gcc.target/i386/cmov1.c
+++ b/gcc/testsuite/gcc.target/i386/cmov1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* This test checks for absolute memory operands.  */
 /* { dg-require-effective-target nonpic } */
 /* { dg-options "-O2 -march=k8" } */
diff --git a/gcc/testsuite/gcc.target/i386/cmov2.c b/gcc/testsuite/gcc.target/i386/cmov2.c
index cd6457f0d5f..2b7c696bb82 100644
--- a/gcc/testsuite/gcc.target/i386/cmov2.c
+++ b/gcc/testsuite/gcc.target/i386/cmov2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -march=k8" } */
 /* { dg-final { scan-assembler "sbb" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/cmov3.c b/gcc/testsuite/gcc.target/i386/cmov3.c
index 6ef2675297d..30a5d1a0fa8 100644
--- a/gcc/testsuite/gcc.target/i386/cmov3.c
+++ b/gcc/testsuite/gcc.target/i386/cmov3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -march=k8" } */
 /* { dg-final { scan-assembler "cmov" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/cmov4.c b/gcc/testsuite/gcc.target/i386/cmov4.c
index e293b34abc1..f25313812f1 100644
--- a/gcc/testsuite/gcc.target/i386/cmov4.c
+++ b/gcc/testsuite/gcc.target/i386/cmov4.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -march=k8" } */
 /* { dg-final { scan-assembler "cmov" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/cmov5.c b/gcc/testsuite/gcc.target/i386/cmov5.c
index 112a9933bbc..898323b44d3 100644
--- a/gcc/testsuite/gcc.target/i386/cmov5.c
+++ b/gcc/testsuite/gcc.target/i386/cmov5.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -march=k8" } */
 /* { dg-final { scan-assembler "sbb" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/cmov6.c b/gcc/testsuite/gcc.target/i386/cmov6.c
index 44dab76c68a..535326e4c2a 100644
--- a/gcc/testsuite/gcc.target/i386/cmov6.c
+++ b/gcc/testsuite/gcc.target/i386/cmov6.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -march=k8" } */
 /* { dg-final { scan-assembler "cmov\[^6\]" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/cmpxchg16b-1.c b/gcc/testsuite/gcc.target/i386/cmpxchg16b-1.c
index 6a066b3936f..fd266f5a010 100644
--- a/gcc/testsuite/gcc.target/i386/cmpxchg16b-1.c
+++ b/gcc/testsuite/gcc.target/i386/cmpxchg16b-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2 -mcx16" } */
 
 typedef int TItype __attribute__ ((mode (TI)));
diff --git a/gcc/testsuite/gcc.target/i386/compress-float-387-pic.c b/gcc/testsuite/gcc.target/i386/compress-float-387-pic.c
index bae12ff1710..fa69eedaa71 100644
--- a/gcc/testsuite/gcc.target/i386/compress-float-387-pic.c
+++ b/gcc/testsuite/gcc.target/i386/compress-float-387-pic.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -march=pentium4 -mtune=prescott -mfpmath=387 -fpic" } */
diff --git a/gcc/testsuite/gcc.target/i386/compress-float-387.c b/gcc/testsuite/gcc.target/i386/compress-float-387.c
index 912d942a0d7..bed2986bc40 100644
--- a/gcc/testsuite/gcc.target/i386/compress-float-387.c
+++ b/gcc/testsuite/gcc.target/i386/compress-float-387.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentium4 -mtune=prescott -mfpmath=387" } */
 double foo (double x) {
diff --git a/gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c b/gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c
index 4999d207ac9..2c9be7cd9f7 100644
--- a/gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c
+++ b/gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -march=pentium4 -mtune=prescott -mfpmath=sse -fpic" } */
diff --git a/gcc/testsuite/gcc.target/i386/compress-float-sse.c b/gcc/testsuite/gcc.target/i386/compress-float-sse.c
index 59b5458d758..48db6111104 100644
--- a/gcc/testsuite/gcc.target/i386/compress-float-sse.c
+++ b/gcc/testsuite/gcc.target/i386/compress-float-sse.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentium4 -mtune=prescott -mfpmath=sse" } */
 double foo (double x) {
diff --git a/gcc/testsuite/gcc.target/i386/cvt-1.c b/gcc/testsuite/gcc.target/i386/cvt-1.c
index d945daf04f1..9535725e572 100644
--- a/gcc/testsuite/gcc.target/i386/cvt-1.c
+++ b/gcc/testsuite/gcc.target/i386/cvt-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -march=k8 -mfpmath=sse" } */
 /* { dg-final { scan-assembler "cvttsd2si" } } */
 /* { dg-final { scan-assembler "cvttss2si" } } */
diff --git a/gcc/testsuite/gcc.target/i386/fpcvt-1.c b/gcc/testsuite/gcc.target/i386/fpcvt-1.c
index 6e65b104163..1c3b9b83453 100644
--- a/gcc/testsuite/gcc.target/i386/fpcvt-1.c
+++ b/gcc/testsuite/gcc.target/i386/fpcvt-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -march=k8" } */
 /* { dg-final { scan-assembler-not "cvtss2sd" } } */
 float a,b;
diff --git a/gcc/testsuite/gcc.target/i386/fpcvt-2.c b/gcc/testsuite/gcc.target/i386/fpcvt-2.c
index 613c2076019..066d84365ed 100644
--- a/gcc/testsuite/gcc.target/i386/fpcvt-2.c
+++ b/gcc/testsuite/gcc.target/i386/fpcvt-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -march=k8" } */
 /* { dg-final { scan-assembler-not "cvtss2sd" } } */
 float a,b;
diff --git a/gcc/testsuite/gcc.target/i386/fpcvt-3.c b/gcc/testsuite/gcc.target/i386/fpcvt-3.c
index f47cd70ed9a..569d21a5aa7 100644
--- a/gcc/testsuite/gcc.target/i386/fpcvt-3.c
+++ b/gcc/testsuite/gcc.target/i386/fpcvt-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -march=k8" } */
 /* { dg-final { scan-assembler-not "cvtss2sd" } } */
 extern double fabs (double);
diff --git a/gcc/testsuite/gcc.target/i386/fpcvt-4.c b/gcc/testsuite/gcc.target/i386/fpcvt-4.c
index 9b35c5acc6c..8257f6520a3 100644
--- a/gcc/testsuite/gcc.target/i386/fpcvt-4.c
+++ b/gcc/testsuite/gcc.target/i386/fpcvt-4.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -march=k8 -mfpmath=sse" } */
 /* { dg-final { scan-assembler "cvtsi2sd" } } */
 /* Check that conversions will get folded.  */
diff --git a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-1.c b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-1.c
index 10e83233854..598f2ddbc31 100644
--- a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-1.c
+++ b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-1.c
@@ -1,4 +1,5 @@
-/* { dg-do preprocess { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do preprocess } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-march=i386" } */
 
 #ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
diff --git a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-2.c b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-2.c
index 9ec0088c259..fa6e7c654ef 100644
--- a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-2.c
+++ b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-2.c
@@ -1,4 +1,5 @@
-/* { dg-do preprocess { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do preprocess } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-march=i486" } */
 
 #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
diff --git a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-3.c b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-3.c
index 8d1889cb7e5..bc5a5598920 100644
--- a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-3.c
+++ b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-3.c
@@ -1,5 +1,6 @@
-/* { dg-do preprocess { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-march=i586" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do preprocess } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-march=i586" } */
 
 #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
 #error nonono
diff --git a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c
index 558483bf49e..27928699f6b 100644
--- a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c
+++ b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c
@@ -1,4 +1,5 @@
-/* { dg-do preprocess { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do preprocess } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-mcx16" } */
 
 #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
diff --git a/gcc/testsuite/gcc.target/i386/large-size-array-3.c b/gcc/testsuite/gcc.target/i386/large-size-array-3.c
index f51ceedac12..07c877a9309 100644
--- a/gcc/testsuite/gcc.target/i386/large-size-array-3.c
+++ b/gcc/testsuite/gcc.target/i386/large-size-array-3.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-mcmodel=medium" } */
 /* { dg-final { scan-assembler "8589934588" } } */
 int bigarray[2147483647];
diff --git a/gcc/testsuite/gcc.target/i386/lea.c b/gcc/testsuite/gcc.target/i386/lea.c
index 011dbc03ed7..afbbfa4fbc0 100644
--- a/gcc/testsuite/gcc.target/i386/lea.c
+++ b/gcc/testsuite/gcc.target/i386/lea.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 /* { dg-final { scan-assembler "leal" } } */
diff --git a/gcc/testsuite/gcc.target/i386/local.c b/gcc/testsuite/gcc.target/i386/local.c
index 2fda2a2fc99..eca16f10698 100644
--- a/gcc/testsuite/gcc.target/i386/local.c
+++ b/gcc/testsuite/gcc.target/i386/local.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -funit-at-a-time" } */
 /* { dg-final { scan-assembler "magic\[^\\n\]*eax" { target ilp32 } } } */
 /* { dg-final { scan-assembler "magic\[^\\n\]*edi" { target lp64 } } } */
diff --git a/gcc/testsuite/gcc.target/i386/local2.c b/gcc/testsuite/gcc.target/i386/local2.c
index 28c89d9ce91..23cd37cef7f 100644
--- a/gcc/testsuite/gcc.target/i386/local2.c
+++ b/gcc/testsuite/gcc.target/i386/local2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -funit-at-a-time -fomit-frame-pointer" } */
 /* { dg-skip-if "PR 25214" { ilp32 } { "-fpic" "-fPIC" } { "" } } */
 /* { dg-final { scan-assembler-not "sub\[^\\n\]*sp" } } */
diff --git a/gcc/testsuite/gcc.target/i386/loop-1.c b/gcc/testsuite/gcc.target/i386/loop-1.c
index 479c80a2d7a..30cfd68f676 100644
--- a/gcc/testsuite/gcc.target/i386/loop-1.c
+++ b/gcc/testsuite/gcc.target/i386/loop-1.c
@@ -1,5 +1,5 @@
 /* PR optimization/9888 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -O3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/loop-2.c b/gcc/testsuite/gcc.target/i386/loop-2.c
index 8994eada46e..cf44d302769 100644
--- a/gcc/testsuite/gcc.target/i386/loop-2.c
+++ b/gcc/testsuite/gcc.target/i386/loop-2.c
@@ -1,6 +1,6 @@
 /* PR optimization/9888 */
 /* Originator: Jim Bray <jb@as220.org> */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -Os" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/loop-3.c b/gcc/testsuite/gcc.target/i386/loop-3.c
index 4e046b28acb..782512f4c36 100644
--- a/gcc/testsuite/gcc.target/i386/loop-3.c
+++ b/gcc/testsuite/gcc.target/i386/loop-3.c
@@ -1,7 +1,7 @@
 /* PR target/11044 */
 /* Originator: Tim McGrath <misty-@charter.net> */
 /* Testcase contributed by Eric Botcazou <ebotcazou@libertysurf.fr> */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -O3 -ffast-math -funroll-loops" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-1.c b/gcc/testsuite/gcc.target/i386/memcpy-1.c
index a3999214cdf..51797e1891c 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-1.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro -minline-all-stringops" } */
 /* { dg-final { scan-assembler "rep" } } */
diff --git a/gcc/testsuite/gcc.target/i386/memset-1.c b/gcc/testsuite/gcc.target/i386/memset-1.c
index 4da21b97ee0..eaf3230ec66 100644
--- a/gcc/testsuite/gcc.target/i386/memset-1.c
+++ b/gcc/testsuite/gcc.target/i386/memset-1.c
@@ -7,7 +7,7 @@
    Written by Michael Meissner, March 9, 2002.
    Target by Roger Sayle, April 25, 2002.  */
 
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -minline-all-stringops" } */
 
 extern void *memset (void *, int, __SIZE_TYPE__);
diff --git a/gcc/testsuite/gcc.target/i386/mmx-1.c b/gcc/testsuite/gcc.target/i386/mmx-1.c
index a658909853c..63d81885d78 100644
--- a/gcc/testsuite/gcc.target/i386/mmx-1.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -mmmx" } */
 
 /* Test that the intrinsics compile with optimization.  All of them are
diff --git a/gcc/testsuite/gcc.target/i386/mmx-2.c b/gcc/testsuite/gcc.target/i386/mmx-2.c
index 0c38579f893..6f6f89b8d29 100644
--- a/gcc/testsuite/gcc.target/i386/mmx-2.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O0 -mmmx" } */
 
 /* Test that the intrinsics compile without optimization.  All of them are
diff --git a/gcc/testsuite/gcc.target/i386/mmx-3.c b/gcc/testsuite/gcc.target/i386/mmx-3.c
index d4d61095c8a..6022d5294e8 100644
--- a/gcc/testsuite/gcc.target/i386/mmx-3.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-3.c
@@ -1,6 +1,6 @@
 /* PR target/8870 */
 /* Originator: otaylor@redhat.com */
-/* { dg-do compile { target i?86-*-* x86_64-*-*} } */
+/* { dg-do compile } */
 /* { dg-options "-O1 -mmmx -march=k8" } */
 
 typedef short v4hi __attribute__ ((vector_size (8)));
diff --git a/gcc/testsuite/gcc.target/i386/mmx-4.c b/gcc/testsuite/gcc.target/i386/mmx-4.c
index 252ba10e6a9..74c894e0cc7 100644
--- a/gcc/testsuite/gcc.target/i386/mmx-4.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-4.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -mmmx" } */
 #include <mmintrin.h>
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.target/i386/mmx-5.c b/gcc/testsuite/gcc.target/i386/mmx-5.c
index 6021825a47d..a58fbb7b10f 100644
--- a/gcc/testsuite/gcc.target/i386/mmx-5.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-5.c
@@ -1,6 +1,6 @@
 /* PR rtl-optimization/17853 */
 /* Contributed by Stuart Hastings <stuart@apple.com> */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -mmmx" } */
 #include <mmintrin.h>
 #include <stdlib.h>
diff --git a/gcc/testsuite/gcc.target/i386/mmx-6.c b/gcc/testsuite/gcc.target/i386/mmx-6.c
index 8938d2cd41d..e0bc6bdd3bd 100644
--- a/gcc/testsuite/gcc.target/i386/mmx-6.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-6.c
@@ -1,6 +1,6 @@
 /* PR middle-end/17767 */
 /* Contributed by Volker Reichelt <reichelt@igpm.rwth-aachen.de> */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O -mmmx" } */
 typedef int __m64 __attribute__ ((vector_size (8)));
 typedef short __v4hi __attribute__ ((vector_size (8)));
diff --git a/gcc/testsuite/gcc.target/i386/monitor.c b/gcc/testsuite/gcc.target/i386/monitor.c
index d98a2fd24af..939969f7919 100644
--- a/gcc/testsuite/gcc.target/i386/monitor.c
+++ b/gcc/testsuite/gcc.target/i386/monitor.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse3" } */
 
 /* Verify that they work in both 32bit and 64bit.  */
diff --git a/gcc/testsuite/gcc.target/i386/mul.c b/gcc/testsuite/gcc.target/i386/mul.c
index d6e378d44dc..94f0b8dc8c4 100644
--- a/gcc/testsuite/gcc.target/i386/mul.c
+++ b/gcc/testsuite/gcc.target/i386/mul.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* This test checks for absolute memory operands.  */
 /* { dg-require-effective-target nonpic } */
 /* { dg-options "-O2 -march=k8" } */
diff --git a/gcc/testsuite/gcc.target/i386/ordcmp-1.c b/gcc/testsuite/gcc.target/i386/ordcmp-1.c
index 1a70e19192d..a136182aca9 100644
--- a/gcc/testsuite/gcc.target/i386/ordcmp-1.c
+++ b/gcc/testsuite/gcc.target/i386/ordcmp-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2" } */
 /* { dg-final { scan-assembler "cmpordss" } } */
 /* { dg-final { scan-assembler "cmpordps" } } */
diff --git a/gcc/testsuite/gcc.target/i386/parity-1.c b/gcc/testsuite/gcc.target/i386/parity-1.c
index f6c881ba895..0094b5bced8 100644
--- a/gcc/testsuite/gcc.target/i386/parity-1.c
+++ b/gcc/testsuite/gcc.target/i386/parity-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2" } */
 /* { dg-final { scan-assembler "setnp" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/parity-2.c b/gcc/testsuite/gcc.target/i386/parity-2.c
index cb7855a66c7..a4c238e0bf1 100644
--- a/gcc/testsuite/gcc.target/i386/parity-2.c
+++ b/gcc/testsuite/gcc.target/i386/parity-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2" } */
 /* { dg-final { scan-assembler "setnp" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pentium4-not-mull.c b/gcc/testsuite/gcc.target/i386/pentium4-not-mull.c
index 2ae7512cb48..be48185a86c 100644
--- a/gcc/testsuite/gcc.target/i386/pentium4-not-mull.c
+++ b/gcc/testsuite/gcc.target/i386/pentium4-not-mull.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentium4" } */
 /* { dg-final { scan-assembler-not "imull" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pic-1.c b/gcc/testsuite/gcc.target/i386/pic-1.c
index 66a18b099e6..bc11de90b41 100644
--- a/gcc/testsuite/gcc.target/i386/pic-1.c
+++ b/gcc/testsuite/gcc.target/i386/pic-1.c
@@ -1,5 +1,5 @@
 /* PR target/8340 */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-fPIC" } */
diff --git a/gcc/testsuite/gcc.target/i386/pr12092-1.c b/gcc/testsuite/gcc.target/i386/pr12092-1.c
index 80c7546d9fb..d85807e8dff 100644
--- a/gcc/testsuite/gcc.target/i386/pr12092-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr12092-1.c
@@ -1,6 +1,6 @@
 /* PR rtl-optimization/12092  */
 /* Test case reduced by Andrew Pinski <pinskia@physics.uc.edu> */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mtune=i486 -march=pentium4 -fprefetch-loop-arrays" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr14289-1.c b/gcc/testsuite/gcc.target/i386/pr14289-1.c
index 71317d542c7..e427b2d0cbd 100644
--- a/gcc/testsuite/gcc.target/i386/pr14289-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr14289-1.c
@@ -1,5 +1,5 @@
 /* PR middle-end/14289 */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O0" } */
 
 register int a[2] asm("ebx");
diff --git a/gcc/testsuite/gcc.target/i386/pr18614-1.c b/gcc/testsuite/gcc.target/i386/pr18614-1.c
index db1870cb733..1a499753760 100644
--- a/gcc/testsuite/gcc.target/i386/pr18614-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr18614-1.c
@@ -1,5 +1,5 @@
 /* PR rtl-optimization/18614 */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2" } */
 
 typedef double v2df __attribute__ ((vector_size (16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr19236-1.c b/gcc/testsuite/gcc.target/i386/pr19236-1.c
index 73b75384384..38db79812c3 100644
--- a/gcc/testsuite/gcc.target/i386/pr19236-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr19236-1.c
@@ -1,5 +1,5 @@
 /* PR target/19236 */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-ffast-math" } */
 
 extern float log1pf (float);
diff --git a/gcc/testsuite/gcc.target/i386/pr20204.c b/gcc/testsuite/gcc.target/i386/pr20204.c
index 7f24abc5529..ca97a3ae9c7 100644
--- a/gcc/testsuite/gcc.target/i386/pr20204.c
+++ b/gcc/testsuite/gcc.target/i386/pr20204.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2" } */
 
 void *x (void *pdst, const void *psrc, unsigned int pn)
diff --git a/gcc/testsuite/gcc.target/i386/pr23943.c b/gcc/testsuite/gcc.target/i386/pr23943.c
index 576cd61c1f9..9e14036ec73 100644
--- a/gcc/testsuite/gcc.target/i386/pr23943.c
+++ b/gcc/testsuite/gcc.target/i386/pr23943.c
@@ -1,6 +1,6 @@
 /* This used to ICE in side_effects_p, due to a problem in cse.c.
    Origin: marcus at jet dot franken dot de.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -fPIC" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr25254.c b/gcc/testsuite/gcc.target/i386/pr25254.c
index b1eff6e6664..ad602024c74 100644
--- a/gcc/testsuite/gcc.target/i386/pr25254.c
+++ b/gcc/testsuite/gcc.target/i386/pr25254.c
@@ -1,5 +1,6 @@
 /* PR target/25254 */
-/* { dg-do compile { target lp64 } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-mcmodel=medium -mlarge-data-threshold=1" } */
 
 const struct { int i; int j; } c = { 2, 6 };
diff --git a/gcc/testsuite/gcc.target/i386/pr25654.c b/gcc/testsuite/gcc.target/i386/pr25654.c
index afb2ff6d2a4..2d7ef221f3c 100644
--- a/gcc/testsuite/gcc.target/i386/pr25654.c
+++ b/gcc/testsuite/gcc.target/i386/pr25654.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target ilp32 } } */
+/* { dg-do run } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mpreferred-stack-boundary=2 -march=i686 -frename-registers" } */
 
 extern void abort (void) __attribute__((noreturn));
diff --git a/gcc/testsuite/gcc.target/i386/pr26778.c b/gcc/testsuite/gcc.target/i386/pr26778.c
index 8a49db5ccc1..6f6f2772585 100644
--- a/gcc/testsuite/gcc.target/i386/pr26778.c
+++ b/gcc/testsuite/gcc.target/i386/pr26778.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target ilp32 } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentium3" } */
 
 typedef union {
diff --git a/gcc/testsuite/gcc.target/i386/pr26826.c b/gcc/testsuite/gcc.target/i386/pr26826.c
index 8b341a236b2..8adab3a363b 100644
--- a/gcc/testsuite/gcc.target/i386/pr26826.c
+++ b/gcc/testsuite/gcc.target/i386/pr26826.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -fomit-frame-pointer -march=i586" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr27827.c b/gcc/testsuite/gcc.target/i386/pr27827.c
index 873fea57446..3b337444a40 100644
--- a/gcc/testsuite/gcc.target/i386/pr27827.c
+++ b/gcc/testsuite/gcc.target/i386/pr27827.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target ilp32 } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mfpmath=387" } */
 
 double a, b;
diff --git a/gcc/testsuite/gcc.target/i386/pr30413.c b/gcc/testsuite/gcc.target/i386/pr30413.c
index cd52d8bd92e..1d3a94f9737 100644
--- a/gcc/testsuite/gcc.target/i386/pr30413.c
+++ b/gcc/testsuite/gcc.target/i386/pr30413.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/pr30505.c b/gcc/testsuite/gcc.target/i386/pr30505.c
index a3b23685f3d..9f8fc42677e 100644
--- a/gcc/testsuite/gcc.target/i386/pr30505.c
+++ b/gcc/testsuite/gcc.target/i386/pr30505.c
@@ -1,5 +1,6 @@
 /* PR inline-asm/30505 */
-/* { dg-do compile { target ilp32 } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
 unsigned long long a, c;
diff --git a/gcc/testsuite/gcc.target/i386/pr30970.c b/gcc/testsuite/gcc.target/i386/pr30970.c
index 5ee7cb368d5..96d64e5a962 100644
--- a/gcc/testsuite/gcc.target/i386/pr30970.c
+++ b/gcc/testsuite/gcc.target/i386/pr30970.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } }
+/* { dg-do compile }
 /* { dg-options "-msse2 -O2 -ftree-vectorize" } */
 
 #define N 256
diff --git a/gcc/testsuite/gcc.target/i386/pr31167.c b/gcc/testsuite/gcc.target/i386/pr31167.c
index bc53920b143..aca12130c9f 100644
--- a/gcc/testsuite/gcc.target/i386/pr31167.c
+++ b/gcc/testsuite/gcc.target/i386/pr31167.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O" } */
 
 typedef int int32_t;
diff --git a/gcc/testsuite/gcc.target/i386/pr32268.c b/gcc/testsuite/gcc.target/i386/pr32268.c
index 203bae87823..f67da9b7cd9 100644
--- a/gcc/testsuite/gcc.target/i386/pr32268.c
+++ b/gcc/testsuite/gcc.target/i386/pr32268.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */
+/* { dg-do run { target *-*-linux* } } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2" } */
 
 extern void abort(void);
diff --git a/gcc/testsuite/gcc.target/i386/pr32280.c b/gcc/testsuite/gcc.target/i386/pr32280.c
index e6377e6451c..d48a635a4b8 100644
--- a/gcc/testsuite/gcc.target/i386/pr32280.c
+++ b/gcc/testsuite/gcc.target/i386/pr32280.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2" } */
 
 typedef long long __m128i __attribute__ ((__vector_size__ (16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr32389.c b/gcc/testsuite/gcc.target/i386/pr32389.c
index 3f4cb3e6228..24c27674cca 100644
--- a/gcc/testsuite/gcc.target/i386/pr32389.c
+++ b/gcc/testsuite/gcc.target/i386/pr32389.c
@@ -1,6 +1,7 @@
 /* Testcase by Mike Frysinger <vapier@gentoo.org>  */
 
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-msse" } */
 
 double f1();
diff --git a/gcc/testsuite/gcc.target/i386/pr32661-1.c b/gcc/testsuite/gcc.target/i386/pr32661-1.c
index 0354fc3421e..068c8618032 100644
--- a/gcc/testsuite/gcc.target/i386/pr32661-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr32661-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2" } */
 
 typedef long long __m128i __attribute__ ((__vector_size__ (16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr32708-1.c b/gcc/testsuite/gcc.target/i386/pr32708-1.c
index 4c2b50c781d..c5308937bb0 100644
--- a/gcc/testsuite/gcc.target/i386/pr32708-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr32708-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2" } */
 
 typedef long long __v2di __attribute__ ((__vector_size__ (16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr32708-2.c b/gcc/testsuite/gcc.target/i386/pr32708-2.c
index d8560f7a8bf..dc31c42a738 100644
--- a/gcc/testsuite/gcc.target/i386/pr32708-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr32708-2.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2 -mtune=k8" } */
 
 typedef long long __v2di __attribute__ ((__vector_size__ (16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr32708-3.c b/gcc/testsuite/gcc.target/i386/pr32708-3.c
index b61b82ae955..dae9a52d126 100644
--- a/gcc/testsuite/gcc.target/i386/pr32708-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr32708-3.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2 -mtune=core2" } */
 
 typedef long long __v2di __attribute__ ((__vector_size__ (16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr9771-1.c b/gcc/testsuite/gcc.target/i386/pr9771-1.c
index 30e42de60b1..01f2f29754d 100644
--- a/gcc/testsuite/gcc.target/i386/pr9771-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr9771-1.c
@@ -1,5 +1,5 @@
 /* PR rtl-optimization/9771 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -fomit-frame-pointer -ffixed-ebp" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/recip-divf.c b/gcc/testsuite/gcc.target/i386/recip-divf.c
index 3b6f5757a6b..b4447d33ac5 100644
--- a/gcc/testsuite/gcc.target/i386/recip-divf.c
+++ b/gcc/testsuite/gcc.target/i386/recip-divf.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -ffast-math -msse -mfpmath=sse -mrecip" } */
 
 float t1(float a, float b)
diff --git a/gcc/testsuite/gcc.target/i386/recip-sqrtf.c b/gcc/testsuite/gcc.target/i386/recip-sqrtf.c
index b6c298feba7..859d2180a39 100644
--- a/gcc/testsuite/gcc.target/i386/recip-sqrtf.c
+++ b/gcc/testsuite/gcc.target/i386/recip-sqrtf.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -ffast-math -msse -mfpmath=sse -mrecip" } */
 
 extern float sqrtf (float);
diff --git a/gcc/testsuite/gcc.target/i386/recip-vec-divf.c b/gcc/testsuite/gcc.target/i386/recip-vec-divf.c
index e4af992d5bf..4bdbba79f34 100644
--- a/gcc/testsuite/gcc.target/i386/recip-vec-divf.c
+++ b/gcc/testsuite/gcc.target/i386/recip-vec-divf.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -ffast-math -ftree-vectorize -msse -mfpmath=sse -mrecip" } */
 
 float a[16];
diff --git a/gcc/testsuite/gcc.target/i386/recip-vec-sqrtf.c b/gcc/testsuite/gcc.target/i386/recip-vec-sqrtf.c
index af444cf55dd..bcef700ec60 100644
--- a/gcc/testsuite/gcc.target/i386/recip-vec-sqrtf.c
+++ b/gcc/testsuite/gcc.target/i386/recip-vec-sqrtf.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -ffast-math -ftree-vectorize -msse -mfpmath=sse -mrecip" } */
 
 float a[16];
diff --git a/gcc/testsuite/gcc.target/i386/regparm.c b/gcc/testsuite/gcc.target/i386/regparm.c
index e3cd8b090ff..7334c972d4d 100644
--- a/gcc/testsuite/gcc.target/i386/regparm.c
+++ b/gcc/testsuite/gcc.target/i386/regparm.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-W -Wall" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/reload-1.c b/gcc/testsuite/gcc.target/i386/reload-1.c
index 1fe0be2f0ee..8ccfcb55d7f 100644
--- a/gcc/testsuite/gcc.target/i386/reload-1.c
+++ b/gcc/testsuite/gcc.target/i386/reload-1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O3 -msse2 -fdump-rtl-csa" } */
 
 #include <emmintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/rotate-1.c b/gcc/testsuite/gcc.target/i386/rotate-1.c
index 0b9ae5a8c13..23dc2ee670b 100644
--- a/gcc/testsuite/gcc.target/i386/rotate-1.c
+++ b/gcc/testsuite/gcc.target/i386/rotate-1.c
@@ -13,4 +13,4 @@ main (void)
   return c;
 }
 
-/* { dg-final { scan-assembler "rolb" { target i?86-*-* x86_64-*-* } } } */
+/* { dg-final { scan-assembler "rolb" } } */
diff --git a/gcc/testsuite/gcc.target/i386/sibcall-5.c b/gcc/testsuite/gcc.target/i386/sibcall-5.c
index d94750099fe..f4127b97515 100644
--- a/gcc/testsuite/gcc.target/i386/sibcall-5.c
+++ b/gcc/testsuite/gcc.target/i386/sibcall-5.c
@@ -1,5 +1,5 @@
 /* Check that indirect sibcalls understand regparm.  */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/signbit-1.c b/gcc/testsuite/gcc.target/i386/signbit-1.c
index adb351a2772..745796d706f 100644
--- a/gcc/testsuite/gcc.target/i386/signbit-1.c
+++ b/gcc/testsuite/gcc.target/i386/signbit-1.c
@@ -1,5 +1,5 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/signbit-2.c b/gcc/testsuite/gcc.target/i386/signbit-2.c
index 8ca63965062..c09bba3b8b3 100644
--- a/gcc/testsuite/gcc.target/i386/signbit-2.c
+++ b/gcc/testsuite/gcc.target/i386/signbit-2.c
@@ -1,5 +1,5 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/signbit-3.c b/gcc/testsuite/gcc.target/i386/signbit-3.c
index a08ca498142..dcd56b636d5 100644
--- a/gcc/testsuite/gcc.target/i386/signbit-3.c
+++ b/gcc/testsuite/gcc.target/i386/signbit-3.c
@@ -1,5 +1,5 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse-10.c b/gcc/testsuite/gcc.target/i386/sse-10.c
index 8c0f28ff8d6..7956619e495 100644
--- a/gcc/testsuite/gcc.target/i386/sse-10.c
+++ b/gcc/testsuite/gcc.target/i386/sse-10.c
@@ -1,5 +1,5 @@
 /* PR 17930 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O1 -msse2 -mfpmath=sse -mno-accumulate-outgoing-args -fno-omit-frame-pointer" } */
 
 #include "../../gcc.dg/i386-cpuid.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse-11.c b/gcc/testsuite/gcc.target/i386/sse-11.c
index 3ec5e7bb124..36312932c84 100644
--- a/gcc/testsuite/gcc.target/i386/sse-11.c
+++ b/gcc/testsuite/gcc.target/i386/sse-11.c
@@ -1,5 +1,5 @@
 /* PR rtl-optimization/21239 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2" } */
 #include <emmintrin.h>
 #include "../../gcc.dg/i386-cpuid.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse-12.c b/gcc/testsuite/gcc.target/i386/sse-12.c
index ef153b2ae85..48c4e7d43f6 100644
--- a/gcc/testsuite/gcc.target/i386/sse-12.c
+++ b/gcc/testsuite/gcc.target/i386/sse-12.c
@@ -1,6 +1,6 @@
 /* Test that {,x,e,p,t,s,a}mmintrin.h, mm3dnow.h and mm_malloc.h are
    usable with -O -std=c89 -pedantic-errors.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O -std=c89 -pedantic-errors -march=k8 -m3dnow -msse4.1 -msse4a" } */
 
 #include <ammintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/sse-13.c b/gcc/testsuite/gcc.target/i386/sse-13.c
index 9b49d9e2917..139d927cf3b 100644
--- a/gcc/testsuite/gcc.target/i386/sse-13.c
+++ b/gcc/testsuite/gcc.target/i386/sse-13.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse4.1 -msse4a" } */
 
 /* Test that the intrinsics compile with optimization.  All of them are
diff --git a/gcc/testsuite/gcc.target/i386/sse-14.c b/gcc/testsuite/gcc.target/i386/sse-14.c
index 8214075c687..8c3a2d2e636 100644
--- a/gcc/testsuite/gcc.target/i386/sse-14.c
+++ b/gcc/testsuite/gcc.target/i386/sse-14.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O0 -msse4.1 -msse4a" } */
 
 /* Test that the intrinsics compile without optimization.  All of them are
diff --git a/gcc/testsuite/gcc.target/i386/sse-15.c b/gcc/testsuite/gcc.target/i386/sse-15.c
index 9f31cfa92f8..5a1da7a755f 100644
--- a/gcc/testsuite/gcc.target/i386/sse-15.c
+++ b/gcc/testsuite/gcc.target/i386/sse-15.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse -msse2" } */
 
 /* Test that the intrinsics compile with optimization.  These were not
diff --git a/gcc/testsuite/gcc.target/i386/sse-16.c b/gcc/testsuite/gcc.target/i386/sse-16.c
index 7f6d817f4d6..e429630cbfb 100644
--- a/gcc/testsuite/gcc.target/i386/sse-16.c
+++ b/gcc/testsuite/gcc.target/i386/sse-16.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O0 -msse" } */
 
 typedef float __vr __attribute__ ((vector_size (16)));
diff --git a/gcc/testsuite/gcc.target/i386/sse-17.c b/gcc/testsuite/gcc.target/i386/sse-17.c
index 86d22c42c53..fc75f64ec5a 100644
--- a/gcc/testsuite/gcc.target/i386/sse-17.c
+++ b/gcc/testsuite/gcc.target/i386/sse-17.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2" } */
 #include <xmmintrin.h>
 extern void abort();
diff --git a/gcc/testsuite/gcc.target/i386/sse-21.c b/gcc/testsuite/gcc.target/i386/sse-21.c
index 119cc94c318..ca4c114d8bb 100644
--- a/gcc/testsuite/gcc.target/i386/sse-21.c
+++ b/gcc/testsuite/gcc.target/i386/sse-21.c
@@ -1,5 +1,5 @@
 /* Test that we don't generate a fisttp instruction when -mno-sse3.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O -mfpmath=387 -march=nocona -mno-sse3" } */
 /* { dg-final { scan-assembler-not "fisttp" } } */
 struct foo
diff --git a/gcc/testsuite/gcc.target/i386/sse-5.c b/gcc/testsuite/gcc.target/i386/sse-5.c
index ced075ae97d..fa40366c38a 100644
--- a/gcc/testsuite/gcc.target/i386/sse-5.c
+++ b/gcc/testsuite/gcc.target/i386/sse-5.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-Winline -O2 -march=i386" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse-6.c b/gcc/testsuite/gcc.target/i386/sse-6.c
index 26932968aad..fbec564e675 100644
--- a/gcc/testsuite/gcc.target/i386/sse-6.c
+++ b/gcc/testsuite/gcc.target/i386/sse-6.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2" } */
 #include <xmmintrin.h>
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.target/i386/sse-7.c b/gcc/testsuite/gcc.target/i386/sse-7.c
index 3d4d1ec45fa..0196d28dfea 100644
--- a/gcc/testsuite/gcc.target/i386/sse-7.c
+++ b/gcc/testsuite/gcc.target/i386/sse-7.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse" } */
 #include <xmmintrin.h>
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.target/i386/sse-8.c b/gcc/testsuite/gcc.target/i386/sse-8.c
index ec3acc16906..b6cb5c8241c 100644
--- a/gcc/testsuite/gcc.target/i386/sse-8.c
+++ b/gcc/testsuite/gcc.target/i386/sse-8.c
@@ -1,10 +1,9 @@
 /* PR target/14343 */
 /* Origin: <Pawe Sikora <pluto@ds14.agh.edu.pl> */
 
-/* The xstormy16 doesn't support V2DI.  */
-/* { dg-do compile { xfail xstormy16-*-* } } */
-/* { dg-options "" } */
-/* { dg-options "-march=pentium3" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-march=pentium3" } */
 
 int main() 
 { 
diff --git a/gcc/testsuite/gcc.target/i386/sse-9.c b/gcc/testsuite/gcc.target/i386/sse-9.c
index 27b4e32c8da..e0bd676d731 100644
--- a/gcc/testsuite/gcc.target/i386/sse-9.c
+++ b/gcc/testsuite/gcc.target/i386/sse-9.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse" } */
 #include <xmmintrin.h>
 #include <stdlib.h>
diff --git a/gcc/testsuite/gcc.target/i386/sse-vect-types.c b/gcc/testsuite/gcc.target/i386/sse-vect-types.c
index 354173a60a3..de799aba2c4 100644
--- a/gcc/testsuite/gcc.target/i386/sse-vect-types.c
+++ b/gcc/testsuite/gcc.target/i386/sse-vect-types.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O0 -msse2" } */
 
 #include <xmmintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/sse2-vec-1.c b/gcc/testsuite/gcc.target/i386/sse2-vec-1.c
index f5508145175..ba7e2e8958f 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-vec-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-vec-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2" } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse2-vec-2.c b/gcc/testsuite/gcc.target/i386/sse2-vec-2.c
index a5156e04868..c7586e14b44 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-vec-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-vec-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2" } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse2-vec-3.c b/gcc/testsuite/gcc.target/i386/sse2-vec-3.c
index 2e5eb6f1918..545dbe0ba0f 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-vec-3.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-vec-3.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2" } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse2-vec-4.c b/gcc/testsuite/gcc.target/i386/sse2-vec-4.c
index ca7d37fc488..31e480659cc 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-vec-4.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-vec-4.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2" } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse2-vec-5.c b/gcc/testsuite/gcc.target/i386/sse2-vec-5.c
index afd7ce81f01..7ca45baa2d9 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-vec-5.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-vec-5.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2" } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse2-vec-6.c b/gcc/testsuite/gcc.target/i386/sse2-vec-6.c
index 13ac364513f..ecd0b331da2 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-vec-6.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-vec-6.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2" } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-addsubpd.c b/gcc/testsuite/gcc.target/i386/sse3-addsubpd.c
index 40cc6e8aa32..8800cd144da 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-addsubpd.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-addsubpd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-addsubps.c b/gcc/testsuite/gcc.target/i386/sse3-addsubps.c
index b5d3f72e977..9d7159d9908 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-addsubps.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-addsubps.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-haddpd.c b/gcc/testsuite/gcc.target/i386/sse3-haddpd.c
index d8fe5b1cd55..74280c20210 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-haddpd.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-haddpd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-haddps.c b/gcc/testsuite/gcc.target/i386/sse3-haddps.c
index feab14ae484..b0331700c32 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-haddps.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-haddps.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-hsubpd.c b/gcc/testsuite/gcc.target/i386/sse3-hsubpd.c
index 841950aff98..3352c495573 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-hsubpd.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-hsubpd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-hsubps.c b/gcc/testsuite/gcc.target/i386/sse3-hsubps.c
index f4a673704d9..f512b9cfb05 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-hsubps.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-hsubps.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-lddqu.c b/gcc/testsuite/gcc.target/i386/sse3-lddqu.c
index 294ff0eac32..abe9ae2d0d8 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-lddqu.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-lddqu.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-movddup.c b/gcc/testsuite/gcc.target/i386/sse3-movddup.c
index 0ceb3f52cf3..84402f2c242 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-movddup.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-movddup.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-movshdup.c b/gcc/testsuite/gcc.target/i386/sse3-movshdup.c
index 62bd9ebe217..f2fa66b7e7d 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-movshdup.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-movshdup.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse3-movsldup.c b/gcc/testsuite/gcc.target/i386/sse3-movsldup.c
index 42d4786f7e7..a2f1ac9ab3d 100644
--- a/gcc/testsuite/gcc.target/i386/sse3-movsldup.c
+++ b/gcc/testsuite/gcc.target/i386/sse3-movsldup.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse3" } */
 
 #include "sse3-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-blendpd.c b/gcc/testsuite/gcc.target/i386/sse4_1-blendpd.c
index 8f51a99cd34..f938e2fffb6 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-blendpd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-blendpd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c b/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c
index 6e0d3d1528c..a8691a60957 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-blendvpd.c b/gcc/testsuite/gcc.target/i386/sse4_1-blendvpd.c
index 3892f826b71..8478234e2ed 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-blendvpd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-blendvpd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-blendvps.c b/gcc/testsuite/gcc.target/i386/sse4_1-blendvps.c
index 6fff7766595..7ff4649004d 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-blendvps.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-blendvps.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-dppd-1.c b/gcc/testsuite/gcc.target/i386/sse4_1-dppd-1.c
index 0a150542c60..8adc4dd2993 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-dppd-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-dppd-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-dppd-2.c b/gcc/testsuite/gcc.target/i386/sse4_1-dppd-2.c
index 2a8a0bcdcf8..10fe37206f5 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-dppd-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-dppd-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-dpps-1.c b/gcc/testsuite/gcc.target/i386/sse4_1-dpps-1.c
index 08c008399a0..03fb2588709 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-dpps-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-dpps-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-dpps-2.c b/gcc/testsuite/gcc.target/i386/sse4_1-dpps-2.c
index 1c9a7c9342e..0b8d4c1fb88 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-dpps-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-dpps-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-extractps.c b/gcc/testsuite/gcc.target/i386/sse4_1-extractps.c
index 03a18dd1be4..36294b8c6c6 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-extractps.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-extractps.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-insertps-1.c b/gcc/testsuite/gcc.target/i386/sse4_1-insertps-1.c
index eaaaf0d8544..d4aad1aa3e6 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-insertps-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-insertps-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-insertps-2.c b/gcc/testsuite/gcc.target/i386/sse4_1-insertps-2.c
index fa9e277b8ea..694aaf136c1 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-insertps-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-insertps-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-movntdqa.c b/gcc/testsuite/gcc.target/i386/sse4_1-movntdqa.c
index a08e317c95a..ae7a9e755ea 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-movntdqa.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-movntdqa.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-mpsadbw.c b/gcc/testsuite/gcc.target/i386/sse4_1-mpsadbw.c
index f327c145b27..c47d95b8c9e 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-mpsadbw.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-mpsadbw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-packusdw.c b/gcc/testsuite/gcc.target/i386/sse4_1-packusdw.c
index d21f4463863..2b6307a788e 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-packusdw.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-packusdw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pblendvb.c b/gcc/testsuite/gcc.target/i386/sse4_1-pblendvb.c
index fe93a783b6a..1fefc27df2f 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pblendvb.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pblendvb.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pblendw.c b/gcc/testsuite/gcc.target/i386/sse4_1-pblendw.c
index 07e59e8a24d..fa18ccdd981 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pblendw.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pblendw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pcmpeqq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pcmpeqq.c
index 34653c4f4c0..a15356a2cba 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pcmpeqq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pcmpeqq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pextrb.c b/gcc/testsuite/gcc.target/i386/sse4_1-pextrb.c
index dc07d02b93d..15d08fad809 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pextrb.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pextrb.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pextrd.c b/gcc/testsuite/gcc.target/i386/sse4_1-pextrd.c
index b078ca26af6..751dca241cb 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pextrd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pextrd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pextrq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pextrq.c
index 999ed8f0634..c9ff97db382 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pextrq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pextrq.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pextrw.c b/gcc/testsuite/gcc.target/i386/sse4_1-pextrw.c
index ebfac1a6ad3..19d783fe505 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pextrw.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pextrw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-phminposuw.c b/gcc/testsuite/gcc.target/i386/sse4_1-phminposuw.c
index 43f1cade760..24fdf2af160 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-phminposuw.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-phminposuw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pinsrb.c b/gcc/testsuite/gcc.target/i386/sse4_1-pinsrb.c
index 2e886c59d92..dd5ee0355dd 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pinsrb.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pinsrb.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pinsrd.c b/gcc/testsuite/gcc.target/i386/sse4_1-pinsrd.c
index 85c39a011f8..e8168815ab3 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pinsrd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pinsrd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pinsrq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pinsrq.c
index 2aa25a0bed5..beeaf839d95 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pinsrq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pinsrq.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmaxsb.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmaxsb.c
index 116f164a6c5..5bd007e52c2 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmaxsb.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmaxsb.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmaxsd.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmaxsd.c
index 2f8dfedc2b6..5e480b3b709 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmaxsd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmaxsd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmaxud.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmaxud.c
index d8f5d9a090e..844f8dab519 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmaxud.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmaxud.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmaxuw.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmaxuw.c
index b0330cbb0f9..99248c1f579 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmaxuw.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmaxuw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pminsb.c b/gcc/testsuite/gcc.target/i386/sse4_1-pminsb.c
index 35ad78f82c0..55192ded5a6 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pminsb.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pminsb.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pminsd.c b/gcc/testsuite/gcc.target/i386/sse4_1-pminsd.c
index 62485c4b81e..c3aeb08244b 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pminsd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pminsd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pminud.c b/gcc/testsuite/gcc.target/i386/sse4_1-pminud.c
index 82e1012bca8..64d69d28823 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pminud.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pminud.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pminuw.c b/gcc/testsuite/gcc.target/i386/sse4_1-pminuw.c
index 0edff3c17f7..afe2f887f82 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pminuw.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pminuw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbd.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbd.c
index 9443ecfc941..7da95a7ccf7 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbq.c
index 11c5c82ac4c..9a1b3e138ca 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbw.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbw.c
index 6c6504c19f8..df908998af3 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbw.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxbw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxdq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxdq.c
index f27b369ff23..96d06cd2099 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxdq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxdq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxwd.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxwd.c
index fbd0e5f6323..7266320154c 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxwd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxwd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxwq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxwq.c
index 67ab24c2f3c..d7e1ded2c20 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxwq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovsxwq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbd.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbd.c
index 1319b524508..e5aa7ee3884 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbq.c
index 53a880ca622..173ebd41a07 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbw.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbw.c
index 8f9f9f18aee..890e5baab39 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbw.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxbw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxdq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxdq.c
index e6df123e191..d24f76690d1 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxdq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxdq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxwd.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxwd.c
index 840c2fc8196..ed2c0e81cef 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxwd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxwd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxwq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxwq.c
index 2f9a9525185..5a5608cb8a2 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxwq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmovzxwq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmuldq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmuldq.c
index cd85a17a71c..597219b6a68 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmuldq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmuldq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pmulld.c b/gcc/testsuite/gcc.target/i386/sse4_1-pmulld.c
index 136b712956e..d77d4539c14 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pmulld.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pmulld.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-ptest-1.c b/gcc/testsuite/gcc.target/i386/sse4_1-ptest-1.c
index 246caeecb15..ec752b7247e 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-ptest-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-ptest-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-ptest-2.c b/gcc/testsuite/gcc.target/i386/sse4_1-ptest-2.c
index 8f12217680f..5343dd24238 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-ptest-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-ptest-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-ptest-3.c b/gcc/testsuite/gcc.target/i386/sse4_1-ptest-3.c
index 65602d9ddf3..1300d7b121f 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-ptest-3.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-ptest-3.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-1.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-1.c
index d39b16e636e..17da21fbf4b 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-2.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-2.c
index 48fb90f7922..1ad9814ebee 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-3.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-3.c
index 6753977ad85..39505788943 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-3.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundpd-3.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundps-1.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundps-1.c
index 370ee13508d..65b891c146c 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundps-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundps-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundps-2.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundps-2.c
index b8b15b8c0f6..44b778f31ee 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundps-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundps-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundps-3.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundps-3.c
index 00ce877f724..3f166b7128c 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundps-3.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundps-3.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-1.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-1.c
index 45810528193..33500d361bd 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-2.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-2.c
index 48bcbc321a9..f6a51db61e8 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-3.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-3.c
index bc5390cce8c..1e419644308 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-3.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-3.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-4.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-4.c
index f63c4d49470..dca97789f3a 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-4.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundsd-4.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundss-1.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundss-1.c
index 68fba94a8b9..d7965781169 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundss-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundss-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundss-2.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundss-2.c
index 77f791c4752..019f2134492 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundss-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundss-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundss-3.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundss-3.c
index 8be6af1caef..2adac1a6059 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundss-3.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundss-3.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-roundss-4.c b/gcc/testsuite/gcc.target/i386/sse4_1-roundss-4.c
index a42d39ba377..dc7f34edb5b 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-roundss-4.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-roundss-4.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-crc32b.c b/gcc/testsuite/gcc.target/i386/sse4_2-crc32b.c
index debede336be..05a609cd1fe 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-crc32b.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-crc32b.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-crc32l.c b/gcc/testsuite/gcc.target/i386/sse4_2-crc32l.c
index 120101bbf47..00cdf6ad374 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-crc32l.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-crc32l.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-crc32q.c b/gcc/testsuite/gcc.target/i386/sse4_2-crc32q.c
index b6350e739ff..8209e993591 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-crc32q.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-crc32q.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-crc32w.c b/gcc/testsuite/gcc.target/i386/sse4_2-crc32w.c
index 96719741049..03991e55370 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-crc32w.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-crc32w.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestri-1.c b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestri-1.c
index 8f7a8e9db89..c66719f04fd 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestri-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestri-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestri-2.c b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestri-2.c
index 6f5cdf33772..ffcd36a0fce 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestri-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestri-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestrm-1.c b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestrm-1.c
index 51bab00e4d8..825c5faf5b2 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestrm-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestrm-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestrm-2.c b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestrm-2.c
index c3dd9823589..f7cf47508a1 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestrm-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpestrm-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpgtq.c b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpgtq.c
index a0e7388d595..c782d85cd31 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpgtq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpgtq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistri-1.c b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistri-1.c
index 033c07c4589..b71abcce8fd 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistri-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistri-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistri-2.c b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistri-2.c
index d2379d771c0..d9249337b59 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistri-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistri-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistrm-1.c b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistrm-1.c
index 3d2ef24ea85..1f2ad7de6db 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistrm-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistrm-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistrm-2.c b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistrm-2.c
index 1890da517b1..18037f9cc4d 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistrm-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-pcmpistrm-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-popcntl.c b/gcc/testsuite/gcc.target/i386/sse4_2-popcntl.c
index 69a32b23de2..30da548d939 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-popcntl.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-popcntl.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-popcntq.c b/gcc/testsuite/gcc.target/i386/sse4_2-popcntq.c
index 78473935d74..aa4d8a91738 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-popcntq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-popcntq.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4a-extract.c b/gcc/testsuite/gcc.target/i386/sse4a-extract.c
index 2c8d2534115..28291ff7dda 100644
--- a/gcc/testsuite/gcc.target/i386/sse4a-extract.c
+++ b/gcc/testsuite/gcc.target/i386/sse4a-extract.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4a } */
 /* { dg-options "-O2 -msse4a" } */
 #include <ammintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/sse4a-insert.c b/gcc/testsuite/gcc.target/i386/sse4a-insert.c
index 8e014d6c046..0c7d0a6c840 100644
--- a/gcc/testsuite/gcc.target/i386/sse4a-insert.c
+++ b/gcc/testsuite/gcc.target/i386/sse4a-insert.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4a } */
 /* { dg-options "-O2 -msse4a" } */
 #include <ammintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/sse4a-montsd.c b/gcc/testsuite/gcc.target/i386/sse4a-montsd.c
index 26fa6b37696..5abbf1335e9 100644
--- a/gcc/testsuite/gcc.target/i386/sse4a-montsd.c
+++ b/gcc/testsuite/gcc.target/i386/sse4a-montsd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4a } */
 /* { dg-options "-O2 -msse4a" } */
 #include <ammintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/sse4a-montss.c b/gcc/testsuite/gcc.target/i386/sse4a-montss.c
index 782c76adf52..d64f8bafe8f 100644
--- a/gcc/testsuite/gcc.target/i386/sse4a-montss.c
+++ b/gcc/testsuite/gcc.target/i386/sse4a-montss.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target sse4a } */
 /* { dg-options "-O2 -msse4a" } */
 #include <ammintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/ssefn-1.c b/gcc/testsuite/gcc.target/i386/ssefn-1.c
index 1f7dea88a3c..0279a553346 100644
--- a/gcc/testsuite/gcc.target/i386/ssefn-1.c
+++ b/gcc/testsuite/gcc.target/i386/ssefn-1.c
@@ -1,7 +1,7 @@
 /* Test argument passing with SSE and local functions
    Written by Paolo Bonzini, 25 January 2005 */
 
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-final { scan-assembler "movss" } } */
 /* { dg-final { scan-assembler "mulss" } } */
diff --git a/gcc/testsuite/gcc.target/i386/ssefn-2.c b/gcc/testsuite/gcc.target/i386/ssefn-2.c
index ded8b724f94..09b920ea7ca 100644
--- a/gcc/testsuite/gcc.target/i386/ssefn-2.c
+++ b/gcc/testsuite/gcc.target/i386/ssefn-2.c
@@ -1,7 +1,7 @@
 /* Test argument passing with SSE2 and local functions
    Written by Paolo Bonzini, 25 January 2005 */
 
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-final { scan-assembler "movss" } } */
 /* { dg-final { scan-assembler "mulss" } } */
diff --git a/gcc/testsuite/gcc.target/i386/ssefn-3.c b/gcc/testsuite/gcc.target/i386/ssefn-3.c
index 925365a8007..2d895f6f4fe 100644
--- a/gcc/testsuite/gcc.target/i386/ssefn-3.c
+++ b/gcc/testsuite/gcc.target/i386/ssefn-3.c
@@ -1,7 +1,7 @@
 /* Execution test for argument passing with SSE and local functions
    Written by Paolo Bonzini, 25 January 2005 */
 
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse -mfpmath=sse" } */
 #include <assert.h>
 #include "../../gcc.dg/i386-cpuid.h"
diff --git a/gcc/testsuite/gcc.target/i386/ssefn-4.c b/gcc/testsuite/gcc.target/i386/ssefn-4.c
index 5547129e8c5..c9d8c7aaba3 100644
--- a/gcc/testsuite/gcc.target/i386/ssefn-4.c
+++ b/gcc/testsuite/gcc.target/i386/ssefn-4.c
@@ -1,7 +1,7 @@
 /* Execution test for argument passing with SSE2 and local functions
    Written by Paolo Bonzini, 25 January 2005 */
 
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-options "-O2 -msse2 -mfpmath=sse" } */
 #include <assert.h>
 #include "../../gcc.dg/i386-cpuid.h"
diff --git a/gcc/testsuite/gcc.target/i386/ssefp-1.c b/gcc/testsuite/gcc.target/i386/ssefp-1.c
index d11a72f1118..621e362f490 100644
--- a/gcc/testsuite/gcc.target/i386/ssefp-1.c
+++ b/gcc/testsuite/gcc.target/i386/ssefp-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -march=k8 -mfpmath=sse" } */
 /* { dg-final { scan-assembler "maxsd" } } */
 /* { dg-final { scan-assembler "minsd" } } */
diff --git a/gcc/testsuite/gcc.target/i386/ssefp-2.c b/gcc/testsuite/gcc.target/i386/ssefp-2.c
index 68790241678..a6caee398b2 100644
--- a/gcc/testsuite/gcc.target/i386/ssefp-2.c
+++ b/gcc/testsuite/gcc.target/i386/ssefp-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -march=k8 -mfpmath=sse" } */
 /* { dg-final { scan-assembler "maxsd" } } */
 /* { dg-final { scan-assembler "minsd" } } */
diff --git a/gcc/testsuite/gcc.target/i386/ssetype-1.c b/gcc/testsuite/gcc.target/i386/ssetype-1.c
index bd6dbbe9f0f..ef89059b8d8 100644
--- a/gcc/testsuite/gcc.target/i386/ssetype-1.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* This test checks for absolute memory operands.  */
 /* { dg-require-effective-target nonpic } */
 /* { dg-options "-O2 -msse2 -march=k8" } */
diff --git a/gcc/testsuite/gcc.target/i386/ssetype-2.c b/gcc/testsuite/gcc.target/i386/ssetype-2.c
index eb57dac7813..b68a63923fb 100644
--- a/gcc/testsuite/gcc.target/i386/ssetype-2.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -march=k8" } */
 /* { dg-final { scan-assembler "andpd" } } */
 /* { dg-final { scan-assembler "andnpd" } } */
diff --git a/gcc/testsuite/gcc.target/i386/ssetype-3.c b/gcc/testsuite/gcc.target/i386/ssetype-3.c
index 3799896c8a4..d6887d5cd20 100644
--- a/gcc/testsuite/gcc.target/i386/ssetype-3.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* This test checks for absolute memory operands.  */
 /* { dg-require-effective-target nonpic } */
 /* { dg-options "-O2 -msse2 -march=k8" } */
diff --git a/gcc/testsuite/gcc.target/i386/ssetype-4.c b/gcc/testsuite/gcc.target/i386/ssetype-4.c
index e9d989ba974..9994b07f21c 100644
--- a/gcc/testsuite/gcc.target/i386/ssetype-4.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-4.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -march=k8" } */
 /* { dg-final { scan-assembler "andps" } } */
 /* { dg-final { scan-assembler "andnps" } } */
diff --git a/gcc/testsuite/gcc.target/i386/ssetype-5.c b/gcc/testsuite/gcc.target/i386/ssetype-5.c
index f9c257aa898..75133e9fa68 100644
--- a/gcc/testsuite/gcc.target/i386/ssetype-5.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-5.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* This test checks for absolute memory operands.  */
 /* { dg-require-effective-target nonpic } */
 /* { dg-options "-O2 -msse2 -march=k8" } */
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-pabsb.c b/gcc/testsuite/gcc.target/i386/ssse3-pabsb.c
index 87dd6fa4edf..83e738feedd 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-pabsb.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-pabsb.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-pabsd.c b/gcc/testsuite/gcc.target/i386/ssse3-pabsd.c
index 09880b70b6c..e677cc50fa8 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-pabsd.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-pabsd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-pabsw.c b/gcc/testsuite/gcc.target/i386/ssse3-pabsw.c
index 53df7ce58fe..431bd30b01b 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-pabsw.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-pabsw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-palignr.c b/gcc/testsuite/gcc.target/i386/ssse3-palignr.c
index eb4bb94e4f9..440de8501b4 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-palignr.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-palignr.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-phaddd.c b/gcc/testsuite/gcc.target/i386/ssse3-phaddd.c
index 00b45c854ab..b9c967d52a7 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-phaddd.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-phaddd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-phaddsw.c b/gcc/testsuite/gcc.target/i386/ssse3-phaddsw.c
index 8efcf3a853c..b8ac8a6ed99 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-phaddsw.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-phaddsw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-phaddw.c b/gcc/testsuite/gcc.target/i386/ssse3-phaddw.c
index 9437c6cc60f..1ce1915dbf1 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-phaddw.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-phaddw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-phsubd.c b/gcc/testsuite/gcc.target/i386/ssse3-phsubd.c
index dd24a3e82f7..c607c7c88cb 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-phsubd.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-phsubd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-phsubsw.c b/gcc/testsuite/gcc.target/i386/ssse3-phsubsw.c
index bf4ad26d1bb..926ae064f8c 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-phsubsw.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-phsubsw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-phsubw.c b/gcc/testsuite/gcc.target/i386/ssse3-phsubw.c
index dd7ccd92b49..eb26fa1ed97 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-phsubw.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-phsubw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-pmaddubsw.c b/gcc/testsuite/gcc.target/i386/ssse3-pmaddubsw.c
index 6f1e2a39240..8803f646caf 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-pmaddubsw.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-pmaddubsw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-pmulhrsw.c b/gcc/testsuite/gcc.target/i386/ssse3-pmulhrsw.c
index d7bbaf9718a..8186e60e1ff 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-pmulhrsw.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-pmulhrsw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-pshufb.c b/gcc/testsuite/gcc.target/i386/ssse3-pshufb.c
index c38b1460eb3..af6055fce06 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-pshufb.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-pshufb.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-psignb.c b/gcc/testsuite/gcc.target/i386/ssse3-psignb.c
index 727b2129c03..8f44cd86f4c 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-psignb.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-psignb.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-psignd.c b/gcc/testsuite/gcc.target/i386/ssse3-psignd.c
index 0a63c4d590f..a1dd3e74ae7 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-psignd.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-psignd.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssse3-psignw.c b/gcc/testsuite/gcc.target/i386/ssse3-psignw.c
index efe88776bee..3770537fa88 100644
--- a/gcc/testsuite/gcc.target/i386/ssse3-psignw.c
+++ b/gcc/testsuite/gcc.target/i386/ssse3-psignw.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ssse3 } */
 /* { dg-options "-O2 -mssse3" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/stack-prot-kernel.c b/gcc/testsuite/gcc.target/i386/stack-prot-kernel.c
index 9d51c56de70..e994cfa6bc1 100644
--- a/gcc/testsuite/gcc.target/i386/stack-prot-kernel.c
+++ b/gcc/testsuite/gcc.target/i386/stack-prot-kernel.c
@@ -1,4 +1,5 @@
-/* { dg-do compile { target lp64 } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-skip-if "darwin x86_64 is pic" { *-*-darwin* } { "*" } { "" } } */
 /* { dg-options "-O2 -fstack-protector-all -mcmodel=kernel" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/stack-realign.c b/gcc/testsuite/gcc.target/i386/stack-realign.c
index 75054e09c7e..ab9360f49f9 100644
--- a/gcc/testsuite/gcc.target/i386/stack-realign.c
+++ b/gcc/testsuite/gcc.target/i386/stack-realign.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mstackrealign -O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/unordcmp-1.c b/gcc/testsuite/gcc.target/i386/unordcmp-1.c
index 3123fe9ada2..49d4b8e076a 100644
--- a/gcc/testsuite/gcc.target/i386/unordcmp-1.c
+++ b/gcc/testsuite/gcc.target/i386/unordcmp-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -msse2" } */
 /* { dg-final { scan-assembler "cmpunordss" } } */
 /* { dg-final { scan-assembler "cmpunordps" } } */
diff --git a/gcc/testsuite/gcc.target/i386/unroll-1.c b/gcc/testsuite/gcc.target/i386/unroll-1.c
index e681474725a..8cf19c4beaf 100644
--- a/gcc/testsuite/gcc.target/i386/unroll-1.c
+++ b/gcc/testsuite/gcc.target/i386/unroll-1.c
@@ -1,5 +1,5 @@
 /* PR optimization/8599 */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-do run } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -O2 -funroll-loops" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/volatile-1.c b/gcc/testsuite/gcc.target/i386/volatile-1.c
index 8a37df48b20..714314ceea2 100644
--- a/gcc/testsuite/gcc.target/i386/volatile-1.c
+++ b/gcc/testsuite/gcc.target/i386/volatile-1.c
@@ -1,6 +1,6 @@
 /* PR optimization/11381 */
 /* Originator: <tobias@ringstrom.mine.nu> */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O" } */
 
 /* Verify that the comparison is not optimized away. */
diff --git a/gcc/testsuite/gcc.target/i386/xchg-1.c b/gcc/testsuite/gcc.target/i386/xchg-1.c
index 464417b607e..e81fe49cd0b 100644
--- a/gcc/testsuite/gcc.target/i386/xchg-1.c
+++ b/gcc/testsuite/gcc.target/i386/xchg-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -march=k8" } */
 
 unsigned short good(unsigned short a)
diff --git a/gcc/testsuite/gcc.target/i386/xchg-2.c b/gcc/testsuite/gcc.target/i386/xchg-2.c
index 1af4c98d741..0853d14c1e7 100644
--- a/gcc/testsuite/gcc.target/i386/xchg-2.c
+++ b/gcc/testsuite/gcc.target/i386/xchg-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-Os" } */
 
 unsigned short good(unsigned short a)
diff --git a/gcc/testsuite/gcc.target/i386/xorps.c b/gcc/testsuite/gcc.target/i386/xorps.c
index 0cf7532a1b9..6803a4d8916 100644
--- a/gcc/testsuite/gcc.target/i386/xorps.c
+++ b/gcc/testsuite/gcc.target/i386/xorps.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-Os -msse2" } */
 
 typedef float __m128 __attribute__ ((vector_size (16)));
author	uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>	2007-08-22 09:59:14 +0000
committer	uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>	2007-08-22 09:59:14 +0000
commit	2741129dffdbfa5d999c0bd6567f4056921d7e97 (patch)
tree	be1e7403d7a429092b9350d16837b9a68fda52f9 /gcc/testsuite/gcc.target
parent	375a9b935d28391dd0349319259954240fbc20e9 (diff)
download	gcc-2741129dffdbfa5d999c0bd6567f4056921d7e97.tar.gz