From 8c7a0ea6ed41ee80a34b249e39108afb14195d89 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Tue, 31 May 2005 18:28:30 +0200
Subject: [PATCH] re PR testsuite/20772 (x86 tests should run on both i?86 and
 x86_64)

	PR testsuite/20772
	* g++.dg/abi/dtor1.C, g++.dg/abi/empty10.C, g++.dg/abi/layout3.C,
	g++.dg/eh/simd-2.C, g++.dg/opt/cse2.C,
	g++.old-deja/g++.ext/asmspec1.C,
	g++.old-deja/g++.other/regstack.C,
	gcc.dg/20000614-1.c, gcc.dg/20000807-1.c, gcc.dg/20000904-1.c,
	gcc.dg/20001127-1.c, gcc.dg/20010202-1.c, gcc.dg/20010520-1.c,
	gcc.dg/20011009-1.c, gcc.dg/20011029-2.c, gcc.dg/20020224-1.c,
	gcc.dg/20020531-1.c, gcc.dg/20020616-1.c, gcc.dg/980226-1.c,
	gcc.dg/980414-1.c, gcc.dg/980520-1.c, gcc.dg/980709-1.c,
	gcc.dg/990117-1.c, gcc.dg/990130-1.c, gcc.dg/990213-2.c,
	gcc.dg/990214-1.c, gcc.dg/991129-1.c, gcc.dg/991209-1.c,
	gcc.dg/991214-1.c, gcc.dg/asm-1.c, gcc.dg/attr-returns_twice-1.c,
	gcc.dg/clobbers.c, gcc.dg/i386-387-7.c, gcc.dg/i386-387-8.c,
	gcc.dg/i386-3dnowA-1.c, gcc.dg/i386-3dnowA-2.c, gcc.dg/i386-asm-1.c
	gcc.dg/i386-asm-2.c, gcc.dg/i386-asm-3.c, gcc.dg/i386-bitfield3.c
	gcc.dg/i386-call-1.c, gcc.dg/i386-memset-1.c,
	gcc.dg/i386-signbit-3.c, gcc.dg/i386-ssefn-1.c,
	gcc.dg/i386-ssefn-2.c, gcc.dg/i386-ssefn-3.c, gcc.dg/i386-ssefn-4.c
	gcc.dg/i386-volatile-1.c, gcc.dg/i386-xorps.c, gcc.dg/pr12092-1.c
	gcc.dg/pr14289-1.c, gcc.dg/pr19236-1.c, gcc.dg/pr20204.c,
	gcc.dg/pr9771-1.c, gcc.dg/register-var-1.c,
	gcc.dg/sibcall-5.c, gcc.dg/charset/asm3.c,
	gcc.dg/cpp/trad/num-sign.c: Run tests also on x86_64.

From-SVN: r100394
---
 gcc/testsuite/ChangeLog                       | 27 +++++++++++++++++++
 gcc/testsuite/g++.dg/abi/dtor1.C              |  4 +--
 gcc/testsuite/g++.dg/abi/empty10.C            |  4 +--
 gcc/testsuite/g++.dg/abi/layout3.C            |  4 +--
 gcc/testsuite/g++.dg/eh/simd-2.C              |  1 +
 gcc/testsuite/g++.dg/opt/cse2.C               |  2 +-
 gcc/testsuite/g++.old-deja/g++.ext/asmspec1.C |  2 +-
 .../g++.old-deja/g++.other/regstack.C         |  2 +-
 gcc/testsuite/gcc.dg/20000614-1.c             |  2 +-
 gcc/testsuite/gcc.dg/20000807-1.c             |  2 +-
 gcc/testsuite/gcc.dg/20000904-1.c             |  2 +-
 gcc/testsuite/gcc.dg/20001127-1.c             |  2 +-
 gcc/testsuite/gcc.dg/20010202-1.c             |  2 +-
 gcc/testsuite/gcc.dg/20010520-1.c             |  2 +-
 gcc/testsuite/gcc.dg/20011009-1.c             |  2 +-
 gcc/testsuite/gcc.dg/20011029-2.c             |  2 +-
 gcc/testsuite/gcc.dg/20020224-1.c             |  2 +-
 gcc/testsuite/gcc.dg/20020531-1.c             |  2 +-
 gcc/testsuite/gcc.dg/20020616-1.c             |  2 +-
 gcc/testsuite/gcc.dg/980226-1.c               |  2 +-
 gcc/testsuite/gcc.dg/980414-1.c               |  2 +-
 gcc/testsuite/gcc.dg/980520-1.c               |  2 +-
 gcc/testsuite/gcc.dg/980709-1.c               |  2 +-
 gcc/testsuite/gcc.dg/990117-1.c               |  4 +--
 gcc/testsuite/gcc.dg/990130-1.c               |  2 +-
 gcc/testsuite/gcc.dg/990213-2.c               |  2 +-
 gcc/testsuite/gcc.dg/990214-1.c               |  2 +-
 gcc/testsuite/gcc.dg/991129-1.c               |  2 +-
 gcc/testsuite/gcc.dg/991209-1.c               |  2 +-
 gcc/testsuite/gcc.dg/991214-1.c               |  2 +-
 gcc/testsuite/gcc.dg/asm-1.c                  |  2 +-
 gcc/testsuite/gcc.dg/attr-returns_twice-1.c   |  2 +-
 gcc/testsuite/gcc.dg/charset/asm3.c           |  2 +-
 gcc/testsuite/gcc.dg/clobbers.c               |  2 +-
 gcc/testsuite/gcc.dg/cpp/trad/num-sign.c      |  2 +-
 gcc/testsuite/gcc.dg/i386-387-7.c             |  2 +-
 gcc/testsuite/gcc.dg/i386-387-8.c             |  3 ++-
 gcc/testsuite/gcc.dg/i386-3dnowA-1.c          |  2 +-
 gcc/testsuite/gcc.dg/i386-3dnowA-2.c          |  2 +-
 gcc/testsuite/gcc.dg/i386-asm-1.c             |  4 +--
 gcc/testsuite/gcc.dg/i386-asm-2.c             |  3 ++-
 gcc/testsuite/gcc.dg/i386-asm-3.c             |  2 +-
 gcc/testsuite/gcc.dg/i386-bitfield3.c         |  2 +-
 gcc/testsuite/gcc.dg/i386-call-1.c            |  2 +-
 gcc/testsuite/gcc.dg/i386-memset-1.c          |  4 +--
 gcc/testsuite/gcc.dg/i386-signbit-3.c         |  4 +--
 gcc/testsuite/gcc.dg/i386-ssefn-1.c           |  3 ++-
 gcc/testsuite/gcc.dg/i386-ssefn-2.c           |  3 ++-
 gcc/testsuite/gcc.dg/i386-ssefn-3.c           |  2 +-
 gcc/testsuite/gcc.dg/i386-ssefn-4.c           |  2 +-
 gcc/testsuite/gcc.dg/i386-volatile-1.c        |  2 +-
 gcc/testsuite/gcc.dg/i386-xorps.c             |  2 +-
 gcc/testsuite/gcc.dg/pr12092-1.c              |  2 +-
 gcc/testsuite/gcc.dg/pr14289-1.c              |  2 +-
 gcc/testsuite/gcc.dg/pr19236-1.c              |  2 +-
 gcc/testsuite/gcc.dg/pr20204.c                |  2 +-
 gcc/testsuite/gcc.dg/pr9771-1.c               |  3 ++-
 gcc/testsuite/gcc.dg/register-var-1.c         |  2 +-
 gcc/testsuite/gcc.dg/sibcall-5.c              |  3 ++-
 59 files changed, 98 insertions(+), 64 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f537330db27..c5f860a7490 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,30 @@
+2005-05-31  Andreas Jaeger  <aj@suse.de>
+
+	PR testsuite/20772
+	* g++.dg/abi/dtor1.C, g++.dg/abi/empty10.C, g++.dg/abi/layout3.C,
+	g++.dg/eh/simd-2.C, g++.dg/opt/cse2.C,
+	g++.old-deja/g++.ext/asmspec1.C,
+	g++.old-deja/g++.other/regstack.C,
+	gcc.dg/20000614-1.c, gcc.dg/20000807-1.c, gcc.dg/20000904-1.c,
+	gcc.dg/20001127-1.c, gcc.dg/20010202-1.c, gcc.dg/20010520-1.c,
+	gcc.dg/20011009-1.c, gcc.dg/20011029-2.c, gcc.dg/20020224-1.c,
+	gcc.dg/20020531-1.c, gcc.dg/20020616-1.c, gcc.dg/980226-1.c,
+	gcc.dg/980414-1.c, gcc.dg/980520-1.c, gcc.dg/980709-1.c,
+	gcc.dg/990117-1.c, gcc.dg/990130-1.c, gcc.dg/990213-2.c,
+	gcc.dg/990214-1.c, gcc.dg/991129-1.c, gcc.dg/991209-1.c,
+	gcc.dg/991214-1.c, gcc.dg/asm-1.c, gcc.dg/attr-returns_twice-1.c,
+	gcc.dg/clobbers.c, gcc.dg/i386-387-7.c, gcc.dg/i386-387-8.c,
+	gcc.dg/i386-3dnowA-1.c, gcc.dg/i386-3dnowA-2.c, gcc.dg/i386-asm-1.c
+	gcc.dg/i386-asm-2.c, gcc.dg/i386-asm-3.c, gcc.dg/i386-bitfield3.c
+	gcc.dg/i386-call-1.c, gcc.dg/i386-memset-1.c,
+	gcc.dg/i386-signbit-3.c, gcc.dg/i386-ssefn-1.c,
+	gcc.dg/i386-ssefn-2.c, gcc.dg/i386-ssefn-3.c, gcc.dg/i386-ssefn-4.c
+	gcc.dg/i386-volatile-1.c, gcc.dg/i386-xorps.c, gcc.dg/pr12092-1.c
+	gcc.dg/pr14289-1.c, gcc.dg/pr19236-1.c, gcc.dg/pr20204.c,
+	gcc.dg/pr9771-1.c, gcc.dg/register-var-1.c,
+	gcc.dg/sibcall-5.c, gcc.dg/charset/asm3.c,
+	gcc.dg/cpp/trad/num-sign.c: Run tests also on x86_64.
+
 2005-05-31  Jeff Law  <law@redhat.com>
 
 	* gcc.dg/tree-ssa/foldaddr-1.c: New test.
diff --git a/gcc/testsuite/g++.dg/abi/dtor1.C b/gcc/testsuite/g++.dg/abi/dtor1.C
index 9ec44ae7520..f9425e013df 100644
--- a/gcc/testsuite/g++.dg/abi/dtor1.C
+++ b/gcc/testsuite/g++.dg/abi/dtor1.C
@@ -1,5 +1,5 @@
-// { dg-do compile { target i?86-*-* } }
-// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=0" }
 
 struct A {
diff --git a/gcc/testsuite/g++.dg/abi/empty10.C b/gcc/testsuite/g++.dg/abi/empty10.C
index 9147e9692f5..ae992944dee 100644
--- a/gcc/testsuite/g++.dg/abi/empty10.C
+++ b/gcc/testsuite/g++.dg/abi/empty10.C
@@ -1,5 +1,5 @@
-// { dg-do run { target i?86-*-* } }
-// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=0 -w" }
 
 struct E {};
diff --git a/gcc/testsuite/g++.dg/abi/layout3.C b/gcc/testsuite/g++.dg/abi/layout3.C
index 121310862db..a30a85219fd 100644
--- a/gcc/testsuite/g++.dg/abi/layout3.C
+++ b/gcc/testsuite/g++.dg/abi/layout3.C
@@ -1,5 +1,5 @@
-// { dg-do run { target i?86-*-* } }
-// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-fabi-version=0 -w" }
 
 struct S {
diff --git a/gcc/testsuite/g++.dg/eh/simd-2.C b/gcc/testsuite/g++.dg/eh/simd-2.C
index 9d9dce509bd..c012670190c 100644
--- a/gcc/testsuite/g++.dg/eh/simd-2.C
+++ b/gcc/testsuite/g++.dg/eh/simd-2.C
@@ -2,6 +2,7 @@
 // Contributed by Aldy Hernandez (aldy@quesejoda.com).
 // { dg-options "-O" }
 // { dg-options "-O -w" { target i?86-*-* } }
+// { dg-options "-O -w" { target { x86_64-*-* && ilp32 } } }
 // { dg-options "-O -w -maltivec" { target powerpc*-*-linux* } }
 // { dg-do run }
 
diff --git a/gcc/testsuite/g++.dg/opt/cse2.C b/gcc/testsuite/g++.dg/opt/cse2.C
index 5a04bf53ecb..325169dff34 100644
--- a/gcc/testsuite/g++.dg/opt/cse2.C
+++ b/gcc/testsuite/g++.dg/opt/cse2.C
@@ -1,6 +1,6 @@
 // This testcase caused ICE on IA-32 in simplify_unary_operation
 // CSE did not assume SUBREGs changing mode from integral to floating.
-// { dg-do run { target i?86-*-* sparc*-*-* } }
+// { dg-do run { target i?86-*-* sparc*-*-* x86_64-*-* } }
 // { dg-options "-O2" }
 
 struct A
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/asmspec1.C b/gcc/testsuite/g++.old-deja/g++.ext/asmspec1.C
index 146f3ac7348..97d4b8e6bfc 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/asmspec1.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/asmspec1.C
@@ -1,4 +1,4 @@
-// { dg-do assemble { target i?86-*-* } }
+// { dg-do assemble { target i?86-*-* x86_64-*-* } }
 // Origin: Anthony Green  <green@cygnus.com>
 
 void foo ()
diff --git a/gcc/testsuite/g++.old-deja/g++.other/regstack.C b/gcc/testsuite/g++.old-deja/g++.other/regstack.C
index 5be2fcd9974..5b833473332 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/regstack.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/regstack.C
@@ -1,4 +1,4 @@
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
 // { dg-options "-O2" }
 
 inline double foo (double x)
diff --git a/gcc/testsuite/gcc.dg/20000614-1.c b/gcc/testsuite/gcc.dg/20000614-1.c
index abc8ca2f714..507596787a6 100644
--- a/gcc/testsuite/gcc.dg/20000614-1.c
+++ b/gcc/testsuite/gcc.dg/20000614-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 void bar(char *p)
diff --git a/gcc/testsuite/gcc.dg/20000807-1.c b/gcc/testsuite/gcc.dg/20000807-1.c
index f6547649483..360e3245989 100644
--- a/gcc/testsuite/gcc.dg/20000807-1.c
+++ b/gcc/testsuite/gcc.dg/20000807-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-Os -fpic" } */
 
 #include <string.h>
diff --git a/gcc/testsuite/gcc.dg/20000904-1.c b/gcc/testsuite/gcc.dg/20000904-1.c
index c6238e35099..31f937cab71 100644
--- a/gcc/testsuite/gcc.dg/20000904-1.c
+++ b/gcc/testsuite/gcc.dg/20000904-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O0 -fpic" } */
 
 static struct {
diff --git a/gcc/testsuite/gcc.dg/20001127-1.c b/gcc/testsuite/gcc.dg/20001127-1.c
index 6ac76e29e92..f63d1149322 100644
--- a/gcc/testsuite/gcc.dg/20001127-1.c
+++ b/gcc/testsuite/gcc.dg/20001127-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 extern inline float bar (float x)
diff --git a/gcc/testsuite/gcc.dg/20010202-1.c b/gcc/testsuite/gcc.dg/20010202-1.c
index f600373b8a3..5f789042eba 100644
--- a/gcc/testsuite/gcc.dg/20010202-1.c
+++ b/gcc/testsuite/gcc.dg/20010202-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* sparc*-*-* } } */
+/* { dg-do compile { target i?86-*-* sparc*-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20010520-1.c b/gcc/testsuite/gcc.dg/20010520-1.c
index c96dbc4eee5..97ee32b0b82 100644
--- a/gcc/testsuite/gcc.dg/20010520-1.c
+++ b/gcc/testsuite/gcc.dg/20010520-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-w" } */
 
 void f ()
diff --git a/gcc/testsuite/gcc.dg/20011009-1.c b/gcc/testsuite/gcc.dg/20011009-1.c
index dbf32e63fba..b78d99e997b 100644
--- a/gcc/testsuite/gcc.dg/20011009-1.c
+++ b/gcc/testsuite/gcc.dg/20011009-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20011029-2.c b/gcc/testsuite/gcc.dg/20011029-2.c
index 6fdc6216678..07ef1a806fe 100644
--- a/gcc/testsuite/gcc.dg/20011029-2.c
+++ b/gcc/testsuite/gcc.dg/20011029-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 int foo (int s)
diff --git a/gcc/testsuite/gcc.dg/20020224-1.c b/gcc/testsuite/gcc.dg/20020224-1.c
index a286b6b0599..c37de2e21b7 100644
--- a/gcc/testsuite/gcc.dg/20020224-1.c
+++ b/gcc/testsuite/gcc.dg/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-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20020531-1.c b/gcc/testsuite/gcc.dg/20020531-1.c
index 19f198fcac1..dfefc17c45a 100644
--- a/gcc/testsuite/gcc.dg/20020531-1.c
+++ b/gcc/testsuite/gcc.dg/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-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -mmmx" } */
 
 typedef unsigned char __v8qi __attribute__ ((vector_size (8)));
diff --git a/gcc/testsuite/gcc.dg/20020616-1.c b/gcc/testsuite/gcc.dg/20020616-1.c
index 4630664d957..6db78425596 100644
--- a/gcc/testsuite/gcc.dg/20020616-1.c
+++ b/gcc/testsuite/gcc.dg/20020616-1.c
@@ -1,5 +1,5 @@
 /* PR opt/6722 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 register int k asm("%ebx");
diff --git a/gcc/testsuite/gcc.dg/980226-1.c b/gcc/testsuite/gcc.dg/980226-1.c
index f9d915f22d4..52ff614ed3a 100644
--- a/gcc/testsuite/gcc.dg/980226-1.c
+++ b/gcc/testsuite/gcc.dg/980226-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O2 } */
 
 extern int printf (const char *, ...);
diff --git a/gcc/testsuite/gcc.dg/980414-1.c b/gcc/testsuite/gcc.dg/980414-1.c
index 59382ef2c49..e179c8137c0 100644
--- a/gcc/testsuite/gcc.dg/980414-1.c
+++ b/gcc/testsuite/gcc.dg/980414-1.c
@@ -1,6 +1,6 @@
 /* Test double on x86. */
 
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O2 } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/980520-1.c b/gcc/testsuite/gcc.dg/980520-1.c
index e1401824f54..b11f0d3a893 100644
--- a/gcc/testsuite/gcc.dg/980520-1.c
+++ b/gcc/testsuite/gcc.dg/980520-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O2 } */
 
 int bug(void)
diff --git a/gcc/testsuite/gcc.dg/980709-1.c b/gcc/testsuite/gcc.dg/980709-1.c
index a4359300587..01b6bfe358e 100644
--- a/gcc/testsuite/gcc.dg/980709-1.c
+++ b/gcc/testsuite/gcc.dg/980709-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O2 } */
 
 extern __inline__ int test_and_set_bit(int nr, volatile void * addr)
diff --git a/gcc/testsuite/gcc.dg/990117-1.c b/gcc/testsuite/gcc.dg/990117-1.c
index 6d71787f305..24c56f2febf 100644
--- a/gcc/testsuite/gcc.dg/990117-1.c
+++ b/gcc/testsuite/gcc.dg/990117-1.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double
diff --git a/gcc/testsuite/gcc.dg/990130-1.c b/gcc/testsuite/gcc.dg/990130-1.c
index 3e711c2febb..57e046b22a6 100644
--- a/gcc/testsuite/gcc.dg/990130-1.c
+++ b/gcc/testsuite/gcc.dg/990130-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options -O0 } */
 
 typedef 	 int SItype	__attribute__ ((mode (SI)));
diff --git a/gcc/testsuite/gcc.dg/990213-2.c b/gcc/testsuite/gcc.dg/990213-2.c
index a0a13b560f9..d095e3723f9 100644
--- a/gcc/testsuite/gcc.dg/990213-2.c
+++ b/gcc/testsuite/gcc.dg/990213-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-fPIC" } */
 
 struct normal_encoding {};
diff --git a/gcc/testsuite/gcc.dg/990214-1.c b/gcc/testsuite/gcc.dg/990214-1.c
index 7ad81b6b90b..b3cb519a471 100644
--- a/gcc/testsuite/gcc.dg/990214-1.c
+++ b/gcc/testsuite/gcc.dg/990214-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-fPIC" } */
 
 typedef int int64_t __attribute__ ((__mode__ (  __DI__ ))) ;
diff --git a/gcc/testsuite/gcc.dg/991129-1.c b/gcc/testsuite/gcc.dg/991129-1.c
index 24faefddaff..489b7f987fa 100644
--- a/gcc/testsuite/gcc.dg/991129-1.c
+++ b/gcc/testsuite/gcc.dg/991129-1.c
@@ -1,6 +1,6 @@
 /* Test against a problem in push_reload.  */
 
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-options "-O2" } */
 
 unsigned long foo (unsigned long long x, unsigned long y)
diff --git a/gcc/testsuite/gcc.dg/991209-1.c b/gcc/testsuite/gcc.dg/991209-1.c
index 2381922c660..ab455da098d 100644
--- a/gcc/testsuite/gcc.dg/991209-1.c
+++ b/gcc/testsuite/gcc.dg/991209-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-options "-ansi -pedantic" } */
 
 int foo ()
diff --git a/gcc/testsuite/gcc.dg/991214-1.c b/gcc/testsuite/gcc.dg/991214-1.c
index 68b6b927916..cfe3a9a4121 100644
--- a/gcc/testsuite/gcc.dg/991214-1.c
+++ b/gcc/testsuite/gcc.dg/991214-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-options "-O2" } */
 
 /* Test against a problem with the combiner substituting explicit hard reg
diff --git a/gcc/testsuite/gcc.dg/asm-1.c b/gcc/testsuite/gcc.dg/asm-1.c
index 1f509422e97..ac4b6be4b10 100644
--- a/gcc/testsuite/gcc.dg/asm-1.c
+++ b/gcc/testsuite/gcc.dg/asm-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 
 struct x {
   int selector;
diff --git a/gcc/testsuite/gcc.dg/attr-returns_twice-1.c b/gcc/testsuite/gcc.dg/attr-returns_twice-1.c
index 9d3f6f10997..9eb082f4b03 100644
--- a/gcc/testsuite/gcc.dg/attr-returns_twice-1.c
+++ b/gcc/testsuite/gcc.dg/attr-returns_twice-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-W" } */
 
 int newsetjmp(void) __attribute__((returns_twice));
diff --git a/gcc/testsuite/gcc.dg/charset/asm3.c b/gcc/testsuite/gcc.dg/charset/asm3.c
index 8ae2212fd26..842bd5cfcfa 100644
--- a/gcc/testsuite/gcc.dg/charset/asm3.c
+++ b/gcc/testsuite/gcc.dg/charset/asm3.c
@@ -1,6 +1,6 @@
 /* Test for complex asm statements. Make sure it compiles
    then test for some of the asm statements not being translated.  */
-/* { dg-do compile { target i?86-*-* } }
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
    { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler "std" } }
    { dg-final { scan-assembler "cld" } }
diff --git a/gcc/testsuite/gcc.dg/clobbers.c b/gcc/testsuite/gcc.dg/clobbers.c
index 474a396a051..44c46b0bf02 100644
--- a/gcc/testsuite/gcc.dg/clobbers.c
+++ b/gcc/testsuite/gcc.dg/clobbers.c
@@ -1,6 +1,6 @@
 /* Test asm clobbers on x86. */
 
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.dg/cpp/trad/num-sign.c b/gcc/testsuite/gcc.dg/cpp/trad/num-sign.c
index 7522bbf41e2..64f12c07211 100644
--- a/gcc/testsuite/gcc.dg/cpp/trad/num-sign.c
+++ b/gcc/testsuite/gcc.dg/cpp/trad/num-sign.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 2001 Free Software Foundation, Inc.  */
 
-/* { dg-do preprocess { target i?86-*-* } } */
+/* { dg-do preprocess { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 /* Tests that traditional numbers are signed, unless otherwise
    specified.  This test assumes a 32 bit target.
diff --git a/gcc/testsuite/gcc.dg/i386-387-7.c b/gcc/testsuite/gcc.dg/i386-387-7.c
index 1a40cd719d8..edcdac1ae3f 100644
--- a/gcc/testsuite/gcc.dg/i386-387-7.c
+++ b/gcc/testsuite/gcc.dg/i386-387-7.c
@@ -1,5 +1,5 @@
 /* Verify that 387 fsincos instruction is generated.  */
-/* { dg-do compile { target "i?86-*-*" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -march=i686" } */
 /* { dg-final { scan-assembler "fsincos" } } */
diff --git a/gcc/testsuite/gcc.dg/i386-387-8.c b/gcc/testsuite/gcc.dg/i386-387-8.c
index 67c16d92c18..6af895998d0 100644
--- a/gcc/testsuite/gcc.dg/i386-387-8.c
+++ b/gcc/testsuite/gcc.dg/i386-387-8.c
@@ -1,6 +1,7 @@
 /* Verify that 387 fptan instruction is generated. Also check fptan
    peephole2 optimizer.  */
-/* { dg-do compile { target "i?86-*-*" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -ffast-math -march=i686" } */
 /* { dg-final { scan-assembler "fptan" } } */
 /* { dg-final { scan-assembler-not "fld1" } } */
diff --git a/gcc/testsuite/gcc.dg/i386-3dnowA-1.c b/gcc/testsuite/gcc.dg/i386-3dnowA-1.c
index b5327b3d9ec..80209b00c29 100644
--- a/gcc/testsuite/gcc.dg/i386-3dnowA-1.c
+++ b/gcc/testsuite/gcc.dg/i386-3dnowA-1.c
@@ -1,4 +1,4 @@
-/* { dg-do assemble { target i?86-*-* } } */
+/* { dg-do assemble { target i?86-*-* x86_64-*-* } } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -Werror-implicit-function-declaration -m3dnow -march=athlon" } */
 
diff --git a/gcc/testsuite/gcc.dg/i386-3dnowA-2.c b/gcc/testsuite/gcc.dg/i386-3dnowA-2.c
index ea336af4147..0cce3b1318c 100644
--- a/gcc/testsuite/gcc.dg/i386-3dnowA-2.c
+++ b/gcc/testsuite/gcc.dg/i386-3dnowA-2.c
@@ -1,4 +1,4 @@
-/* { dg-do assemble { target i?86-*-* } } */
+/* { dg-do assemble { target i?86-*-* x86_64-*-* } } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O0 -Werror-implicit-function-declaration -m3dnow -march=athlon" } */
 
diff --git a/gcc/testsuite/gcc.dg/i386-asm-1.c b/gcc/testsuite/gcc.dg/i386-asm-1.c
index a23e0a09298..e871dd9343f 100644
--- a/gcc/testsuite/gcc.dg/i386-asm-1.c
+++ b/gcc/testsuite/gcc.dg/i386-asm-1.c
@@ -1,6 +1,6 @@
 /* PR inline-asm/11676 */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/i386-asm-2.c b/gcc/testsuite/gcc.dg/i386-asm-2.c
index e143ea36978..7e9ecb7797d 100644
--- a/gcc/testsuite/gcc.dg/i386-asm-2.c
+++ b/gcc/testsuite/gcc.dg/i386-asm-2.c
@@ -1,5 +1,6 @@
 /* PR opt/13862 */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O" } */
 
 typedef struct _fame_syntax_t_ {
diff --git a/gcc/testsuite/gcc.dg/i386-asm-3.c b/gcc/testsuite/gcc.dg/i386-asm-3.c
index f60f7d6378a..19bf1534521 100644
--- a/gcc/testsuite/gcc.dg/i386-asm-3.c
+++ b/gcc/testsuite/gcc.dg/i386-asm-3.c
@@ -1,5 +1,5 @@
 /* PR inline-asm/6806 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/i386-bitfield3.c b/gcc/testsuite/gcc.dg/i386-bitfield3.c
index 781c2f7ba4e..111f5f28c42 100644
--- a/gcc/testsuite/gcc.dg/i386-bitfield3.c
+++ b/gcc/testsuite/gcc.dg/i386-bitfield3.c
@@ -1,5 +1,5 @@
 // Test for bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* } }
+// { dg-do run { target i?86-*-* x86_64-*-* } }
 // { dg-options "-O2" }
 // { dg-options "-mno-align-double -mno-ms-bitfields" { target *-*-interix* } }
 
diff --git a/gcc/testsuite/gcc.dg/i386-call-1.c b/gcc/testsuite/gcc.dg/i386-call-1.c
index 9cd49da3b2f..3c3d642babd 100644
--- a/gcc/testsuite/gcc.dg/i386-call-1.c
+++ b/gcc/testsuite/gcc.dg/i386-call-1.c
@@ -1,6 +1,6 @@
 /* PR optimization/11304 */
 /* Originator: <manuel.serrano@sophia.inria.fr> */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O -fomit-frame-pointer" } */
 
 /* Verify that %eax is always restored after a call.  */
diff --git a/gcc/testsuite/gcc.dg/i386-memset-1.c b/gcc/testsuite/gcc.dg/i386-memset-1.c
index b87a05b8df7..4da21b97ee0 100644
--- a/gcc/testsuite/gcc.dg/i386-memset-1.c
+++ b/gcc/testsuite/gcc.dg/i386-memset-1.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002  Free Software Foundation.
+/* Copyright (C) 2002, 2005  Free Software Foundation.
 
    Test -minline-all-stringops memset with various combinations of pointer
    alignments and lengths to make sure builtin optimizations are correct.
@@ -7,7 +7,7 @@
    Written by Michael Meissner, March 9, 2002.
    Target by Roger Sayle, April 25, 2002.  */
 
-/* { dg-do run { target "i?86-*-*" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -minline-all-stringops" } */
 
 extern void *memset (void *, int, __SIZE_TYPE__);
diff --git a/gcc/testsuite/gcc.dg/i386-signbit-3.c b/gcc/testsuite/gcc.dg/i386-signbit-3.c
index 882e6421415..a08ca498142 100644
--- a/gcc/testsuite/gcc.dg/i386-signbit-3.c
+++ b/gcc/testsuite/gcc.dg/i386-signbit-3.c
@@ -1,6 +1,6 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/i386-ssefn-1.c b/gcc/testsuite/gcc.dg/i386-ssefn-1.c
index a8b0b14e73c..548c580571f 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefn-1.c
+++ b/gcc/testsuite/gcc.dg/i386-ssefn-1.c
@@ -1,7 +1,8 @@
 /* Test argument passing with SSE and local functions
    Written by Paolo Bonzini, 25 January 2005 */
 
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-final { scan-assembler "movss" } } */
 /* { dg-final { scan-assembler "mulss" } } */
 /* { dg-final { scan-assembler-not "movsd" } } */
diff --git a/gcc/testsuite/gcc.dg/i386-ssefn-2.c b/gcc/testsuite/gcc.dg/i386-ssefn-2.c
index 0e1970032e9..ded8b724f94 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefn-2.c
+++ b/gcc/testsuite/gcc.dg/i386-ssefn-2.c
@@ -1,7 +1,8 @@
 /* Test argument passing with SSE2 and local functions
    Written by Paolo Bonzini, 25 January 2005 */
 
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-final { scan-assembler "movss" } } */
 /* { dg-final { scan-assembler "mulss" } } */
 /* { dg-final { scan-assembler "movsd" } } */
diff --git a/gcc/testsuite/gcc.dg/i386-ssefn-3.c b/gcc/testsuite/gcc.dg/i386-ssefn-3.c
index 2816919f7c2..c1b61301f34 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefn-3.c
+++ b/gcc/testsuite/gcc.dg/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-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -msse -mfpmath=sse" } */
 #include <assert.h>
 #include "i386-cpuid.h"
diff --git a/gcc/testsuite/gcc.dg/i386-ssefn-4.c b/gcc/testsuite/gcc.dg/i386-ssefn-4.c
index 353afcec0a1..a28382e2826 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefn-4.c
+++ b/gcc/testsuite/gcc.dg/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-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -msse2 -mfpmath=sse" } */
 #include <assert.h>
 #include "i386-cpuid.h"
diff --git a/gcc/testsuite/gcc.dg/i386-volatile-1.c b/gcc/testsuite/gcc.dg/i386-volatile-1.c
index 633ea5022ec..8a37df48b20 100644
--- a/gcc/testsuite/gcc.dg/i386-volatile-1.c
+++ b/gcc/testsuite/gcc.dg/i386-volatile-1.c
@@ -1,6 +1,6 @@
 /* PR optimization/11381 */
 /* Originator: <tobias@ringstrom.mine.nu> */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O" } */
 
 /* Verify that the comparison is not optimized away. */
diff --git a/gcc/testsuite/gcc.dg/i386-xorps.c b/gcc/testsuite/gcc.dg/i386-xorps.c
index 86daa794ab4..0cf7532a1b9 100644
--- a/gcc/testsuite/gcc.dg/i386-xorps.c
+++ b/gcc/testsuite/gcc.dg/i386-xorps.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-Os -msse2" } */
 
 typedef float __m128 __attribute__ ((vector_size (16)));
diff --git a/gcc/testsuite/gcc.dg/pr12092-1.c b/gcc/testsuite/gcc.dg/pr12092-1.c
index 1b29452881f..80c7546d9fb 100644
--- a/gcc/testsuite/gcc.dg/pr12092-1.c
+++ b/gcc/testsuite/gcc.dg/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-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mtune=i486 -march=pentium4 -fprefetch-loop-arrays" } */
 
diff --git a/gcc/testsuite/gcc.dg/pr14289-1.c b/gcc/testsuite/gcc.dg/pr14289-1.c
index 652916325c2..71317d542c7 100644
--- a/gcc/testsuite/gcc.dg/pr14289-1.c
+++ b/gcc/testsuite/gcc.dg/pr14289-1.c
@@ -1,5 +1,5 @@
 /* PR middle-end/14289 */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O0" } */
 
 register int a[2] asm("ebx");
diff --git a/gcc/testsuite/gcc.dg/pr19236-1.c b/gcc/testsuite/gcc.dg/pr19236-1.c
index 77365aa4074..73b75384384 100644
--- a/gcc/testsuite/gcc.dg/pr19236-1.c
+++ b/gcc/testsuite/gcc.dg/pr19236-1.c
@@ -1,5 +1,5 @@
 /* PR target/19236 */
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-ffast-math" } */
 
 extern float log1pf (float);
diff --git a/gcc/testsuite/gcc.dg/pr20204.c b/gcc/testsuite/gcc.dg/pr20204.c
index ad85af5baa3..7f24abc5529 100644
--- a/gcc/testsuite/gcc.dg/pr20204.c
+++ b/gcc/testsuite/gcc.dg/pr20204.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 void *x (void *pdst, const void *psrc, unsigned int pn)
diff --git a/gcc/testsuite/gcc.dg/pr9771-1.c b/gcc/testsuite/gcc.dg/pr9771-1.c
index 1e3bc036aee..30e42de60b1 100644
--- a/gcc/testsuite/gcc.dg/pr9771-1.c
+++ b/gcc/testsuite/gcc.dg/pr9771-1.c
@@ -1,5 +1,6 @@
 /* PR rtl-optimization/9771 */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -fomit-frame-pointer -ffixed-ebp" } */
 
 extern void abort(void);
diff --git a/gcc/testsuite/gcc.dg/register-var-1.c b/gcc/testsuite/gcc.dg/register-var-1.c
index 6869b034dcf..a27d56c4b66 100644
--- a/gcc/testsuite/gcc.dg/register-var-1.c
+++ b/gcc/testsuite/gcc.dg/register-var-1.c
@@ -1,6 +1,6 @@
 /* PR/18160 */
 
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 
 /* This should yield an error even without -pedantic.  */
 /* { dg-options "-ansi" } */
diff --git a/gcc/testsuite/gcc.dg/sibcall-5.c b/gcc/testsuite/gcc.dg/sibcall-5.c
index da95f13e25c..d94750099fe 100644
--- a/gcc/testsuite/gcc.dg/sibcall-5.c
+++ b/gcc/testsuite/gcc.dg/sibcall-5.c
@@ -1,5 +1,6 @@
 /* Check that indirect sibcalls understand regparm.  */
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
-- 
2.30.2