diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0cc71162665..04b5429cc46 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,84 @@
+2014-11-02  Uros Bizjak  <ubizjak@gmail.com>
+
+	* c-c++-common/ubsan/float-cast-overflow-6.c: Add i?86-*-* target.
+	* g++.dg/abi/no-weak1.C: Ditto.
+	* g++.dg/opt/pr44919.C: Ditto.
+	* g++.dg/opt/pr46640.C: Ditto.
+	* g++.dg/opt/pr46649.C: Ditto.
+	* g++.dg/opt/pr47036.C: Ditto.
+	* g++.dg/opt/pr48273.C: Ditto.
+	* g++.dg/opt/pr48302.C: Ditto.
+	* g++.dg/opt/pr45788.C: Ditto.
+	* g++.dg/opt/pr57662.C: Ditto.
+	* gcc.dg/20031102-1.c: Ditto.
+	* gcc.dg/builtin-bswap-7.c: Ditto.
+	* gcc.dg/builtin-bswap-7a.c: Ditto.
+	* gcc.dg/builtin-bswap-9.c: Ditto.
+	* gcc.dg/combine_ashiftrt_1.c: Ditto.
+	* gcc.dg/guality/bswaptest.c: Ditto.
+	* gcc.dg/guality/clztest.c: Ditto.
+	* gcc.dg/guality/ctztest.c: Ditto.
+	* gcc.dg/guality/pr45003-1.c: Ditto.
+	* gcc.dg/guality/pr45003-2.c: Ditto.
+	* gcc.dg/guality/pr45003-3.c: Ditto.
+	* gcc.dg/guality/pr58791-4.c: Ditto.
+	* gcc.dg/guality/rotatetest.c:Ditto.
+	* gcc.dg/ifcvt-fabs-1.c: Ditto.
+	* gcc.dg/ira-loop-pressure.c: Ditto.
+	* gcc.dg/ira-shrinkwrap-prep-1.c: Ditto.
+	* gcc.dg/ira-shrinkwrap-prep-2.c: Ditto.
+	* gcc.dg/lto/pr47259_0.c: Ditto.
+	* gcc.dg/memcpy-5.c: Ditto.
+	* gcc.dg/pr10474.c: Ditto.
+	* gcc.dg/pr37438.c: Ditto.
+	* gcc.dg/pr39453.c: Ditto.
+	* gcc.dg/pr40501.c: Ditto.
+	* gcc.dg/pr42245-2.c: Ditto.
+	* gcc.dg/pr42245.c: Ditto.
+	* gcc.dg/pr42246.c: Ditto.
+	* gcc.dg/pr42249.c: Ditto.
+	* gcc.dg/pr42388.c: Ditto.
+	* gcc.dg/pr42389.c: Ditto.
+	* gcc.dg/pr45352-1.c: Ditto.
+	* gcc.dg/pr45352-2.c: Ditto.
+	* gcc.dg/pr45352-3.c: Ditto.
+	* gcc.dg/pr45352.c: Ditto.
+	* gcc.dg/pr45472.c: Ditto.
+	* gcc.dg/pr45652.c: Ditto.
+	* gcc.dg/pr46212.c: Ditto.
+	* gcc.dg/pr46521.c: Ditto.
+	* gcc.dg/pr46522.c: Ditto.
+	* gcc.dg/pr46875.c: Ditto.
+	* gcc.dg/pr48374.c: Ditto.
+	* gcc.dg/pr50251.c: Ditto.
+	* gcc.dg/pr54472.c: Ditto.
+	* gcc.dg/pr55702.c: Ditto.
+	* gcc.dg/pr56990.c: Ditto.
+	* gcc.dg/pr57104.c: Ditto.
+	* gcc.dg/pr57662.c: Ditto.
+	* gcc.dg/pr60866.c: Ditto.
+	* gcc.dg/shrink-wrap-loop.c: Ditto.
+	* gcc.dg/tm/memopt-15.c: Ditto.
+	* gcc.dg/torture/pr52720.c: Ditto.
+	* gcc.dg/torture/pr56778.c: Ditto.
+	* gcc.dg/tree-prof/pr45354.c: Ditto.
+	* gcc.dg/tree-prof/pr50907.c: Ditto.
+	* gcc.dg/tree-ssa/loop-16.c: Ditto.
+	* gcc.dg/tree-ssa/loop-18.c: Ditto.
+	* gcc.dg/tree-ssa/pr44423.c: Ditto.
+	* gcc.dg/misc-tests/godump-1.c: Ditto.
+	* gfortran.dg/PR24188.f: Ditto.
+	* gfortran.dg/errnocheck_1.f90: Ditto.
+	* gfortran.dg/g77/20010216-1.f: Ditto.
+	* gfortran.dg/pr42246-2.f: Ditto.
+	* gfortran.dg/pr42294.f: Ditto.
+	* gfortran.dg/pr44691.f: Ditto.
+	* gfortran.dg/vect/pr45714-a.f: Ditto.
+	* gcc.c-torture/execute/ieee/ieee.exp: Ditto.
+	* gcc.misc-tests/linkage.exp: Ditto.
+	* lib/target-supports.exp: Reformat x86 tagets.
+	(check_effective_target_whole_vector_shift): Add i?86-*-* target.
+
 2014-11-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/57694
diff --git a/gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-6.c b/gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-6.c
index 73b8b95b554..a2b5f9a28ce 100644
--- a/gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-6.c
+++ b/gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-6.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { x86_64-*-* ia64-*-* } && { ! { ia32 } } } } } */
+/* { dg-do run { target { { { i?86-*-* x86_64-*-* } && { ! { ia32 } } || { ia64-*-* } } } } } */
 /* { dg-options "-fsanitize=float-cast-overflow" } */
 
 #include <limits.h>
diff --git a/gcc/testsuite/g++.dg/abi/no-weak1.C b/gcc/testsuite/g++.dg/abi/no-weak1.C
index 663643f3e96..065c414ff81 100644
--- a/gcc/testsuite/g++.dg/abi/no-weak1.C
+++ b/gcc/testsuite/g++.dg/abi/no-weak1.C
@@ -1,6 +1,6 @@
 // { dg-options "-fno-weak" }
-// { dg-final { scan-assembler "local\[ \t\]*_ZZL1fvE1i" { target x86_64-*-*gnu } } }
-// { dg-final { scan-assembler "local\[ \t\]*_ZZ1gIiEvvE1i" { target x86_64-*-*gnu } } }
+// { dg-final { scan-assembler "local\[ \t\]*_ZZL1fvE1i" { target i?86-*-gnu* x86_64-*-gnu* } } }
+// { dg-final { scan-assembler "local\[ \t\]*_ZZ1gIiEvvE1i" { target i?86-*-gnu* x86_64-*-gnu* } } }
 
 static inline void f()
 {
diff --git a/gcc/testsuite/g++.dg/opt/pr44919.C b/gcc/testsuite/g++.dg/opt/pr44919.C
index e90851be317..a4aeec822bc 100644
--- a/gcc/testsuite/g++.dg/opt/pr44919.C
+++ b/gcc/testsuite/g++.dg/opt/pr44919.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } }
+// { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } }
 // { dg-options "-O3 -fselective-scheduling2" }
 
 namespace std {
diff --git a/gcc/testsuite/g++.dg/opt/pr46640.C b/gcc/testsuite/g++.dg/opt/pr46640.C
index 0892c9ac861..1c25778e8da 100644
--- a/gcc/testsuite/g++.dg/opt/pr46640.C
+++ b/gcc/testsuite/g++.dg/opt/pr46640.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target x86_64-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
 // { dg-options "-fschedule-insns2 -fsel-sched-pipelining -fselective-scheduling2 -fno-exceptions -O" }
 
 struct QBasicAtomicInt
diff --git a/gcc/testsuite/g++.dg/opt/pr46649.C b/gcc/testsuite/g++.dg/opt/pr46649.C
index 1428e8bddbe..55e96505186 100644
--- a/gcc/testsuite/g++.dg/opt/pr46649.C
+++ b/gcc/testsuite/g++.dg/opt/pr46649.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } }
+// { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } }
 // { dg-options "-fschedule-insns -fselective-scheduling" }
 
 void foo ()
diff --git a/gcc/testsuite/g++.dg/opt/pr47036.C b/gcc/testsuite/g++.dg/opt/pr47036.C
index d6d5adc6a48..94444c38737 100644
--- a/gcc/testsuite/g++.dg/opt/pr47036.C
+++ b/gcc/testsuite/g++.dg/opt/pr47036.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } }
+// { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } }
 // { dg-options "-fschedule-insns -fselective-scheduling -fno-dce" }
 
 
diff --git a/gcc/testsuite/g++.dg/opt/pr48273.C b/gcc/testsuite/g++.dg/opt/pr48273.C
index 4c5108bdd26..340e3a10194 100644
--- a/gcc/testsuite/g++.dg/opt/pr48273.C
+++ b/gcc/testsuite/g++.dg/opt/pr48273.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target x86_64-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
 // { dg-options "-fschedule-insns2 -fsel-sched-pipelining -fselective-scheduling2 -funroll-all-loops -march=core2" }
 
 void bar ();
diff --git a/gcc/testsuite/g++.dg/opt/pr48302.C b/gcc/testsuite/g++.dg/opt/pr48302.C
index fd51ba412e1..9d939713ff8 100644
--- a/gcc/testsuite/g++.dg/opt/pr48302.C
+++ b/gcc/testsuite/g++.dg/opt/pr48302.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } }
+// { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } }
 // { dg-options "-O -fcrossjumping -fgcse -fschedule-insns2 -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops -fselective-scheduling2 --param lim-expensive=320 --param min-crossjump-insns=1" }
 
 struct S
diff --git a/gcc/testsuite/g++.dg/pr45788.C b/gcc/testsuite/g++.dg/pr45788.C
index de3340df331..0f4db20c769 100644
--- a/gcc/testsuite/g++.dg/pr45788.C
+++ b/gcc/testsuite/g++.dg/pr45788.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target x86_64-*-* } }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
 // { dg-options "-O3 -fwhole-program -msse2" }
 
 typedef long unsigned int __darwin_size_t;
diff --git a/gcc/testsuite/g++.dg/pr57662.C b/gcc/testsuite/g++.dg/pr57662.C
index 1354790e976..bd5793dcaea 100644
--- a/gcc/testsuite/g++.dg/pr57662.C
+++ b/gcc/testsuite/g++.dg/pr57662.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fselective-scheduling2 -fsel-sched-pipelining" } */
 
 extern "C" {
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp b/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp
index 33b1264fb30..cdd2a3ce74d 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp
@@ -41,10 +41,8 @@ set additional_flags "-fno-inline"
 
 # We must use -ffloat-store/-mieee to ensure that excess precision on some
 # machines does not cause problems
-if [istarget "i\[34567\]86-*-*"] then {
-  lappend additional_flags "-ffloat-store"
-}
-if { [istarget "x86_64-*-*"] && [check_effective_target_ia32] } then {
+if { ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"])
+     && [check_effective_target_ia32] } then {
   lappend additional_flags "-ffloat-store"
 }
 if [istarget "m68k-*-*"] then {
diff --git a/gcc/testsuite/gcc.dg/20031102-1.c b/gcc/testsuite/gcc.dg/20031102-1.c
index 2148381a43b..b50434feff4 100644
--- a/gcc/testsuite/gcc.dg/20031102-1.c
+++ b/gcc/testsuite/gcc.dg/20031102-1.c
@@ -3,7 +3,7 @@
 
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -march=i686" { target { { i686-*-* x86_64-*-* } && ia32 } } } */
+/* { dg-options "-O2 -march=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
 
 /* Verify that reload_cse_move2add doesn't add unexpected CLOBBERs. */
 
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-7.c b/gcc/testsuite/gcc.dg/builtin-bswap-7.c
index 035c7368ad0..4a42bfc65c9 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-7.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-7.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target arm*-*-* alpha*-*-* ia64*-*-* x86_64-*-* s390x-*-* powerpc*-*-* rs6000-*-* } } */
+/* { dg-do compile { target arm*-*-* alpha*-*-* ia64*-*-* i?86-*-* x86_64-*-* s390x-*-* powerpc*-*-* rs6000-*-* } } */
 /* { dg-require-effective-target stdint_types } */
 /* { dg-require-effective-target lp64 } */
 /* { dg-options "-O -fdump-rtl-combine" } */
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-7a.c b/gcc/testsuite/gcc.dg/builtin-bswap-7a.c
index d77bd478366..5712e219961 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-7a.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-7a.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target arm*-*-* alpha*-*-* ia64*-*-* x86_64-*-* s390x-*-* powerpc*-*-* rs6000-*-* } } */
+/* { dg-do compile { target arm*-*-* alpha*-*-* ia64*-*-* i?86-*-* x86_64-*-* s390x-*-* powerpc*-*-* rs6000-*-* } } */
 /* { dg-require-effective-target stdint_types } */
 /* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2 -fdump-rtl-combine" } */
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-9.c b/gcc/testsuite/gcc.dg/builtin-bswap-9.c
index 4aa1a40c43e..4a2cf7de10e 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-9.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-9.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target arm*-*-* alpha*-*-* ia64*-*-* x86_64-*-* s390x-*-* powerpc*-*-* rs6000-*-* } } */
+/* { dg-do compile { target arm*-*-* alpha*-*-* ia64*-*-* i?86-*-* x86_64-*-* s390x-*-* powerpc*-*-* rs6000-*-* } } */
 /* { dg-require-effective-target stdint_types } */
 /* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2 -fdump-rtl-combine" } */
diff --git a/gcc/testsuite/gcc.dg/combine_ashiftrt_1.c b/gcc/testsuite/gcc.dg/combine_ashiftrt_1.c
index 90e64fd10dc..c2ba918424d 100644
--- a/gcc/testsuite/gcc.dg/combine_ashiftrt_1.c
+++ b/gcc/testsuite/gcc.dg/combine_ashiftrt_1.c
@@ -1,4 +1,5 @@
-/* { dg-do compile {target sparc64*-*-* aarch64*-*-* x86_64-*-* powerpc64*-*-*} } */
+/* { dg-do compile {target sparc64*-*-* aarch64*-*-* i?86-*-* x86_64-*-* powerpc64*-*-*} } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2 -fdump-rtl-combine-all" } */
 
 typedef long long int int64_t;
diff --git a/gcc/testsuite/gcc.dg/guality/bswaptest.c b/gcc/testsuite/gcc.dg/guality/bswaptest.c
index 38b9d981c87..c924f6e2fc8 100644
--- a/gcc/testsuite/gcc.dg/guality/bswaptest.c
+++ b/gcc/testsuite/gcc.dg/guality/bswaptest.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 /* { dg-options "-g" } */
 
 volatile int vv;
diff --git a/gcc/testsuite/gcc.dg/guality/clztest.c b/gcc/testsuite/gcc.dg/guality/clztest.c
index 9428be30b87..b91059cc78e 100644
--- a/gcc/testsuite/gcc.dg/guality/clztest.c
+++ b/gcc/testsuite/gcc.dg/guality/clztest.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 /* { dg-options "-g" } */
 
 volatile int vv;
diff --git a/gcc/testsuite/gcc.dg/guality/ctztest.c b/gcc/testsuite/gcc.dg/guality/ctztest.c
index d243845ec98..ea8d076d31a 100644
--- a/gcc/testsuite/gcc.dg/guality/ctztest.c
+++ b/gcc/testsuite/gcc.dg/guality/ctztest.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 /* { dg-options "-g" } */
 
 volatile int vv;
diff --git a/gcc/testsuite/gcc.dg/guality/pr45003-1.c b/gcc/testsuite/gcc.dg/guality/pr45003-1.c
index 7cef8f6284c..9fc22f22b1e 100644
--- a/gcc/testsuite/gcc.dg/guality/pr45003-1.c
+++ b/gcc/testsuite/gcc.dg/guality/pr45003-1.c
@@ -1,5 +1,5 @@
 /* PR debug/45003 */
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 /* { dg-options "-g" } */
 
 int __attribute__((noinline))
diff --git a/gcc/testsuite/gcc.dg/guality/pr45003-2.c b/gcc/testsuite/gcc.dg/guality/pr45003-2.c
index dcdba237ff4..7e395d43e16 100644
--- a/gcc/testsuite/gcc.dg/guality/pr45003-2.c
+++ b/gcc/testsuite/gcc.dg/guality/pr45003-2.c
@@ -1,5 +1,5 @@
 /* PR debug/45003 */
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 /* { dg-options "-g" } */
 
 int __attribute__((noinline))
diff --git a/gcc/testsuite/gcc.dg/guality/pr45003-3.c b/gcc/testsuite/gcc.dg/guality/pr45003-3.c
index 3adc4f2383e..5a7c5a8a0c4 100644
--- a/gcc/testsuite/gcc.dg/guality/pr45003-3.c
+++ b/gcc/testsuite/gcc.dg/guality/pr45003-3.c
@@ -1,5 +1,5 @@
 /* PR debug/45003 */
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-*  x86_64-*-* } && lp64 } } } */
 /* { dg-options "-g" } */
 
 int __attribute__((noinline))
diff --git a/gcc/testsuite/gcc.dg/guality/pr58791-4.c b/gcc/testsuite/gcc.dg/guality/pr58791-4.c
index d988a9cfbbe..2d8b5a5a0dd 100644
--- a/gcc/testsuite/gcc.dg/guality/pr58791-4.c
+++ b/gcc/testsuite/gcc.dg/guality/pr58791-4.c
@@ -11,8 +11,8 @@ foo (float a, float b, float c, float d, float l, double u)
   float f = d * e;
   double g = (double) f;
   double h = (double) b;
-  double i = g * h;			/* { dg-final { gdb-test pr58791-4.c:32 "i" "486" { target { x86_64-*-* && lp64 } } } } */
-  double i2 = i + 1.0;			/* { dg-final { gdb-test pr58791-4.c:32 "i2" "487" { target { x86_64-*-* && lp64 } } } } */
+  double i = g * h;			/* { dg-final { gdb-test pr58791-4.c:32 "i" "486" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */
+  double i2 = i + 1.0;			/* { dg-final { gdb-test pr58791-4.c:32 "i2" "487" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */
   double j = i * 3.25;
   double k = h + j;
   float m = l * 8.75;
diff --git a/gcc/testsuite/gcc.dg/guality/rotatetest.c b/gcc/testsuite/gcc.dg/guality/rotatetest.c
index 64f5340a090..d44c2807a42 100644
--- a/gcc/testsuite/gcc.dg/guality/rotatetest.c
+++ b/gcc/testsuite/gcc.dg/guality/rotatetest.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 /* { dg-options "-g" } */
 
 volatile int vv;
diff --git a/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c b/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c
index 40c57d83616..409bbc4fea0 100644
--- a/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c
+++ b/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-O" } */
-/* { dg-options "-O -march=i686" { target { { i686-*-* x86_64-*-* } && ia32 } } } */
+/* { dg-options "-O -march=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
 
 extern void abort(void);
 
diff --git a/gcc/testsuite/gcc.dg/ira-loop-pressure.c b/gcc/testsuite/gcc.dg/ira-loop-pressure.c
index 7ef4fa7be93..28ce6cde9b7 100644
--- a/gcc/testsuite/gcc.dg/ira-loop-pressure.c
+++ b/gcc/testsuite/gcc.dg/ira-loop-pressure.c
@@ -2,7 +2,7 @@
    register classes.  In this case, register pressue of INT is high.  But
    we can still move the FP invariant out of the loop.  */
 
-/* { dg-do compile { target { x86_64-*-* && lp64 } } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 /* { dg-options "-O2 -fira-loop-pressure -fdump-rtl-loop2_invariant " } */
 
 float tt;
diff --git a/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-1.c b/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-1.c
index 615f0329a4b..162232be81d 100644
--- a/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-1.c
+++ b/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { { x86_64-*-* && lp64 } || { { powerpc*-*-* && lp64 } || { arm_nothumb || { aarch64*-*-* && lp64 } } } } } } */
+/* { dg-do compile { target { { { i?86-*-* x86_64-*-* } && lp64 } || { { powerpc*-*-* && lp64 } || { arm_nothumb || { aarch64*-*-* && lp64 } } } } } } */
 /* { dg-options "-O3 -fdump-rtl-ira -fdump-rtl-pro_and_epilogue -fno-use-caller-save"  } */
 
 long __attribute__((noinline, noclone))
diff --git a/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-2.c b/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-2.c
index 5f559373802..1da12a490b6 100644
--- a/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-2.c
+++ b/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { { x86_64-*-* && lp64 } || { { powerpc*-*-* && lp64 } || { arm_nothumb || { aarch64*-*-* && lp64 } } } } } } */
+/* { dg-do compile { target { { { i?86-*-* x86_64-*-* } && lp64 } || { { powerpc*-*-* && lp64 } || { arm_nothumb || { aarch64*-*-* && lp64 } } } } } } */
 /* { dg-options "-O3 -fdump-rtl-ira -fdump-rtl-pro_and_epilogue -fno-use-caller-save"  } */
 
 long __attribute__((noinline, noclone))
diff --git a/gcc/testsuite/gcc.dg/lto/pr47259_0.c b/gcc/testsuite/gcc.dg/lto/pr47259_0.c
index 7900e5a8b04..bda485cae5b 100644
--- a/gcc/testsuite/gcc.dg/lto/pr47259_0.c
+++ b/gcc/testsuite/gcc.dg/lto/pr47259_0.c
@@ -1,5 +1,5 @@
 /* { dg-lto-do link } */
-/* { dg-skip-if "" { ! { x86_64-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "" { ! { i?86-*-* x86_64-*-* } } { "*" } { "" } } */
 /* { dg-lto-options { { -O2 -flto -w } } } */
 
 register int r asm("esi");
diff --git a/gcc/testsuite/gcc.dg/memcpy-5.c b/gcc/testsuite/gcc.dg/memcpy-5.c
index 67854dca45e..9f98bbabd61 100644
--- a/gcc/testsuite/gcc.dg/memcpy-5.c
+++ b/gcc/testsuite/gcc.dg/memcpy-5.c
@@ -24,5 +24,5 @@ TEST (d32d, double __attribute__((vector_size (32))));
 TEST (d64d, double __attribute__((vector_size (64))));
 TEST (d128d, double __attribute__((vector_size (128))));
 
-/* { dg-final { scan-tree-dump-not "memcpy" "optimized" { target x86_64-*-* } } } */
+/* { dg-final { scan-tree-dump-not "memcpy" "optimized" { target i?86-*-* x86_64-*-* } } } */
 /* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr10474.c b/gcc/testsuite/gcc.dg/pr10474.c
index e8dbd3c10b0..726ff4e516c 100644
--- a/gcc/testsuite/gcc.dg/pr10474.c
+++ b/gcc/testsuite/gcc.dg/pr10474.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { { x86_64-*-* && lp64 } || { { powerpc*-*-* && lp64 } || { arm_nothumb || { aarch64*-*-* && lp64 } } } } } } */
+/* { dg-do compile { target { { { i?86-*-* x86_64-*-* } && lp64 } || { { powerpc*-*-* && lp64 } || { arm_nothumb || { aarch64*-*-* && lp64 } } } } } } */
 /* { dg-options "-O3 -fdump-rtl-pro_and_epilogue"  } */
 
 void f(int *i)
diff --git a/gcc/testsuite/gcc.dg/pr37438.c b/gcc/testsuite/gcc.dg/pr37438.c
index 7365dc9e739..b64994c2483 100644
--- a/gcc/testsuite/gcc.dg/pr37438.c
+++ b/gcc/testsuite/gcc.dg/pr37438.c
@@ -1,7 +1,7 @@
 /* PR target/37438 */
 /* { dg-do compile } */
 /* { dg-options "-Os" } */
-/* { dg-options "-Os -march=i486" { target { { i686-*-* x86_64-*-* } && ia32 } } } */
+/* { dg-options "-Os -march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
 
 extern int bar (unsigned long long int);
 extern int baz (const char *, unsigned int, unsigned short);
diff --git a/gcc/testsuite/gcc.dg/pr39453.c b/gcc/testsuite/gcc.dg/pr39453.c
index 66ecc3fa020..35815230a75 100644
--- a/gcc/testsuite/gcc.dg/pr39453.c
+++ b/gcc/testsuite/gcc.dg/pr39453.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fselective-scheduling2 -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops" } */
 
 int foo(int k, int n)
diff --git a/gcc/testsuite/gcc.dg/pr40501.c b/gcc/testsuite/gcc.dg/pr40501.c
index 0e43e63c654..e6ce217b626 100644
--- a/gcc/testsuite/gcc.dg/pr40501.c
+++ b/gcc/testsuite/gcc.dg/pr40501.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target alpha*-*-* ia64*-*-* x86_64-*-* s390x-*-* } } */
+/* { dg-do compile { target alpha*-*-* ia64*-*-* i?86-*-* x86_64-*-* s390x-*-* } } */
 /* { dg-options "-O2" } */
 /* { dg-require-effective-target lp64 } */
 
diff --git a/gcc/testsuite/gcc.dg/pr42245-2.c b/gcc/testsuite/gcc.dg/pr42245-2.c
index 48f9e0eb853..e99fe3759d9 100644
--- a/gcc/testsuite/gcc.dg/pr42245-2.c
+++ b/gcc/testsuite/gcc.dg/pr42245-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fselective-scheduling -fsel-sched-pipelining" } */
 
 int
diff --git a/gcc/testsuite/gcc.dg/pr42245.c b/gcc/testsuite/gcc.dg/pr42245.c
index 98dd1d067e7..a516e7ae544 100644
--- a/gcc/testsuite/gcc.dg/pr42245.c
+++ b/gcc/testsuite/gcc.dg/pr42245.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fselective-scheduling -fsel-sched-pipelining" } */
 
 extern int N_words;
diff --git a/gcc/testsuite/gcc.dg/pr42246.c b/gcc/testsuite/gcc.dg/pr42246.c
index ee17a211210..163f2b4a638 100644
--- a/gcc/testsuite/gcc.dg/pr42246.c
+++ b/gcc/testsuite/gcc.dg/pr42246.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fselective-scheduling -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops" } */
 
 typedef enum
diff --git a/gcc/testsuite/gcc.dg/pr42249.c b/gcc/testsuite/gcc.dg/pr42249.c
index 21708749d5a..3289d54d6b9 100644
--- a/gcc/testsuite/gcc.dg/pr42249.c
+++ b/gcc/testsuite/gcc.dg/pr42249.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fselective-scheduling -fsel-sched-pipelining" } */
 
 typedef struct TypHeader
diff --git a/gcc/testsuite/gcc.dg/pr42388.c b/gcc/testsuite/gcc.dg/pr42388.c
index ad97eb4d98a..a68a2e85b61 100644
--- a/gcc/testsuite/gcc.dg/pr42388.c
+++ b/gcc/testsuite/gcc.dg/pr42388.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fselective-scheduling -fmodulo-sched" } */
 
 enum rtx_code
diff --git a/gcc/testsuite/gcc.dg/pr42389.c b/gcc/testsuite/gcc.dg/pr42389.c
index c398012f2b4..8bb06ae9439 100644
--- a/gcc/testsuite/gcc.dg/pr42389.c
+++ b/gcc/testsuite/gcc.dg/pr42389.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fselective-scheduling -fsel-sched-pipelining -fsched-pressure" } */
 
 struct s_linked_f_pointer
diff --git a/gcc/testsuite/gcc.dg/pr45352-1.c b/gcc/testsuite/gcc.dg/pr45352-1.c
index 3b092cd13ed..2183f0eea00 100644
--- a/gcc/testsuite/gcc.dg/pr45352-1.c
+++ b/gcc/testsuite/gcc.dg/pr45352-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O3 -fschedule-insns -fschedule-insns2 -fselective-scheduling2 -fsel-sched-pipelining -funroll-loops -fprefetch-loop-arrays" } */
 
 void main1 (float *pa, float *pc)
diff --git a/gcc/testsuite/gcc.dg/pr45352-2.c b/gcc/testsuite/gcc.dg/pr45352-2.c
index eed3847177c..e81ed30f03b 100644
--- a/gcc/testsuite/gcc.dg/pr45352-2.c
+++ b/gcc/testsuite/gcc.dg/pr45352-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O1 -freorder-blocks -fschedule-insns2 -funswitch-loops -fselective-scheduling2 -fsel-sched-pipelining -funroll-all-loops" } */
 void
 foo1 (int *s)
diff --git a/gcc/testsuite/gcc.dg/pr45352-3.c b/gcc/testsuite/gcc.dg/pr45352-3.c
index ce7879f860a..c642a70855b 100644
--- a/gcc/testsuite/gcc.dg/pr45352-3.c
+++ b/gcc/testsuite/gcc.dg/pr45352-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O -fprofile-generate -fgcse -fno-gcse-lm -fgcse-sm -fno-ivopts -fno-tree-loop-im -ftree-pre -funroll-loops -fno-web -fschedule-insns2 -fselective-scheduling2 -fsel-sched-pipelining" } */
 
 extern volatile float f[];
diff --git a/gcc/testsuite/gcc.dg/pr45352.c b/gcc/testsuite/gcc.dg/pr45352.c
index 75f9a213706..7aeac0da371 100644
--- a/gcc/testsuite/gcc.dg/pr45352.c
+++ b/gcc/testsuite/gcc.dg/pr45352.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-Os -fselective-scheduling2 -fsel-sched-pipelining -fprofile-generate" } */
 
 static inline void
diff --git a/gcc/testsuite/gcc.dg/pr45472.c b/gcc/testsuite/gcc.dg/pr45472.c
index 573e83d700c..6cbc392a50b 100644
--- a/gcc/testsuite/gcc.dg/pr45472.c
+++ b/gcc/testsuite/gcc.dg/pr45472.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O -fschedule-insns2 -fselective-scheduling2" } */
 
 struct S
diff --git a/gcc/testsuite/gcc.dg/pr45652.c b/gcc/testsuite/gcc.dg/pr45652.c
index 8f55f0c8cb1..74e284ca4a1 100644
--- a/gcc/testsuite/gcc.dg/pr45652.c
+++ b/gcc/testsuite/gcc.dg/pr45652.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do run { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fselective-scheduling2" } */
 
 struct S {
diff --git a/gcc/testsuite/gcc.dg/pr46212.c b/gcc/testsuite/gcc.dg/pr46212.c
index 3329ed5f47c..a549a99050f 100644
--- a/gcc/testsuite/gcc.dg/pr46212.c
+++ b/gcc/testsuite/gcc.dg/pr46212.c
@@ -1,7 +1,7 @@
 /* PR rtl-optimization/46212 */
 /* { dg-do compile } */
 /* { dg-options "-O3 -funroll-loops" } */
-/* { dg-options "-O3 -funroll-loops -march=i386" { target { { i686-*-* x86_64-*-* } && ia32 } } } */
+/* { dg-options "-O3 -funroll-loops -march=i386" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
 /* { dg-require-effective-target int32plus } */
 
 static inline unsigned
diff --git a/gcc/testsuite/gcc.dg/pr46521.c b/gcc/testsuite/gcc.dg/pr46521.c
index 0c41c4328f8..905b3e0c036 100644
--- a/gcc/testsuite/gcc.dg/pr46521.c
+++ b/gcc/testsuite/gcc.dg/pr46521.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-Os -fselective-scheduling2 -fsel-sched-pipelining -fprofile-generate -fno-early-inlining" } */
 
 static void bmp_iter_next (int *bi)
diff --git a/gcc/testsuite/gcc.dg/pr46522.c b/gcc/testsuite/gcc.dg/pr46522.c
index 13a5aa9da57..9e8e08ca7fc 100644
--- a/gcc/testsuite/gcc.dg/pr46522.c
+++ b/gcc/testsuite/gcc.dg/pr46522.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O3 -fkeep-inline-functions -fsel-sched-pipelining -fselective-scheduling2 -funroll-loops" } */
 
 struct S
diff --git a/gcc/testsuite/gcc.dg/pr46875.c b/gcc/testsuite/gcc.dg/pr46875.c
index c601708dc11..8b6d23680fa 100644
--- a/gcc/testsuite/gcc.dg/pr46875.c
+++ b/gcc/testsuite/gcc.dg/pr46875.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-Os -fselective-scheduling2" } */
 
 long
diff --git a/gcc/testsuite/gcc.dg/pr48374.c b/gcc/testsuite/gcc.dg/pr48374.c
index 24826d5f885..d694a785387 100644
--- a/gcc/testsuite/gcc.dg/pr48374.c
+++ b/gcc/testsuite/gcc.dg/pr48374.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O -fschedule-insns2 -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops -fselective-scheduling2 --param max-sched-extend-regions-iters=2"  } */
 
 void foo (int y)
diff --git a/gcc/testsuite/gcc.dg/pr50251.c b/gcc/testsuite/gcc.dg/pr50251.c
index f791aa88278..57b3d971aef 100644
--- a/gcc/testsuite/gcc.dg/pr50251.c
+++ b/gcc/testsuite/gcc.dg/pr50251.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target { ! { x86_64-*-mingw* } } } } */
 /* { dg-options "-O2" } */
-/* { dg-additional-options "-mpreferred-stack-boundary=12" { target x86_64-*-* } } */
+/* { dg-additional-options "-mpreferred-stack-boundary=12" { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 
 extern void bar (int*);
 
diff --git a/gcc/testsuite/gcc.dg/pr54472.c b/gcc/testsuite/gcc.dg/pr54472.c
index 93952038ec4..20c85b47aed 100644
--- a/gcc/testsuite/gcc.dg/pr54472.c
+++ b/gcc/testsuite/gcc.dg/pr54472.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O -fschedule-insns -fselective-scheduling" } */
 
 int main ()
diff --git a/gcc/testsuite/gcc.dg/pr55702.c b/gcc/testsuite/gcc.dg/pr55702.c
index 8770a3758d7..bf3d3ae5ea2 100644
--- a/gcc/testsuite/gcc.dg/pr55702.c
+++ b/gcc/testsuite/gcc.dg/pr55702.c
@@ -1,5 +1,5 @@
 /* PR sanitizer/55702 */
-/* { dg-do compile { target { x86_64-*-linux* && lp64 } } } */
+/* { dg-do compile { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */
 /* { dg-options "-fsanitize=thread" } */
 
 void
diff --git a/gcc/testsuite/gcc.dg/pr56990.c b/gcc/testsuite/gcc.dg/pr56990.c
index ecb6acef6f3..c857785c834 100644
--- a/gcc/testsuite/gcc.dg/pr56990.c
+++ b/gcc/testsuite/gcc.dg/pr56990.c
@@ -1,5 +1,5 @@
 /* PR sanitizer/56990 */
-/* { dg-do compile { target { x86_64-*-linux* && lp64 } } } */
+/* { dg-do compile { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */
 /* { dg-options "-fsanitize=thread" } */
 
 struct S{};
diff --git a/gcc/testsuite/gcc.dg/pr57104.c b/gcc/testsuite/gcc.dg/pr57104.c
index 3a7013bea31..2539d59c5b6 100644
--- a/gcc/testsuite/gcc.dg/pr57104.c
+++ b/gcc/testsuite/gcc.dg/pr57104.c
@@ -1,5 +1,5 @@
 /* PR tree-optimization/57104 */
-/* { dg-do compile { target { x86_64-*-linux* && lp64 } } } */
+/* { dg-do compile { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */
 /* { dg-options "-fsanitize=thread" } */
 
 register int r asm ("r14");
diff --git a/gcc/testsuite/gcc.dg/pr57662.c b/gcc/testsuite/gcc.dg/pr57662.c
index 7af845532b8..253bf689146 100644
--- a/gcc/testsuite/gcc.dg/pr57662.c
+++ b/gcc/testsuite/gcc.dg/pr57662.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options " -O -fno-guess-branch-probability -fpeel-loops -freorder-blocks-and-partition -fschedule-insns2 -fsel-sched-pipelining -fselective-scheduling2 -ftree-pre" } */
 
 struct intC
diff --git a/gcc/testsuite/gcc.dg/pr60866.c b/gcc/testsuite/gcc.dg/pr60866.c
index 020878d41de..a97f4e5cb03 100644
--- a/gcc/testsuite/gcc.dg/pr60866.c
+++ b/gcc/testsuite/gcc.dg/pr60866.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O -fselective-scheduling -fno-if-conversion -fschedule-insns"  } */
 
 int n;
diff --git a/gcc/testsuite/gcc.dg/shrink-wrap-loop.c b/gcc/testsuite/gcc.dg/shrink-wrap-loop.c
index e72edfa6c44..f540d2914de 100644
--- a/gcc/testsuite/gcc.dg/shrink-wrap-loop.c
+++ b/gcc/testsuite/gcc.dg/shrink-wrap-loop.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { { x86_64-*-* && lp64 } || { arm_thumb2 } } } } */
+/* { dg-do compile { target { { { i?86-*-* x86_64-*-* } && lp64 } || { arm_thumb2 } } } } */
 /* { dg-options "-O2 -fdump-rtl-pro_and_epilogue"  } */
 
 int foo (int *p1, int *p2);
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-15.c b/gcc/testsuite/gcc.dg/tm/memopt-15.c
index 975c794337c..bf74db7f62d 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-15.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-15.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { x86_64-*-linux* } } } */
+/* { dg-do compile { target { i?86-*-linux* x86_64-*-linux* } } } */
 /* { dg-options "-fgnu-tm -O" } */
 
 /* Test the TM vector logging functions.  */
diff --git a/gcc/testsuite/gcc.dg/torture/pr52720.c b/gcc/testsuite/gcc.dg/torture/pr52720.c
index ac0bfb643b2..b8a906e225e 100644
--- a/gcc/testsuite/gcc.dg/torture/pr52720.c
+++ b/gcc/testsuite/gcc.dg/torture/pr52720.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=k8-sse3" { target x86_64-*-* } } */
+/* { dg-options "-march=k8-sse3" { target i?86-*-* x86_64-*-* } } */
 
 struct alu_bank_swizzle {
     int hw_gpr[3][4];
diff --git a/gcc/testsuite/gcc.dg/torture/pr56778.c b/gcc/testsuite/gcc.dg/torture/pr56778.c
index 48068774af3..a1eea497de2 100644
--- a/gcc/testsuite/gcc.dg/torture/pr56778.c
+++ b/gcc/testsuite/gcc.dg/torture/pr56778.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=core-avx2" { target x86_64-*-* } } */
+/* { dg-options "-march=core-avx2" { target i?86-*-* x86_64-*-* } } */
 
 typedef struct {
     float a,b,c;
diff --git a/gcc/testsuite/gcc.dg/tree-prof/pr45354.c b/gcc/testsuite/gcc.dg/tree-prof/pr45354.c
index 849e786bb2d..441d16144cb 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/pr45354.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/pr45354.c
@@ -1,5 +1,5 @@
 /* { dg-require-effective-target freorder } */
-/* { dg-options "-O2 -freorder-blocks-and-partition -fschedule-insns -fselective-scheduling" { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-options "-O2 -freorder-blocks-and-partition -fschedule-insns -fselective-scheduling" { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.dg/tree-prof/pr50907.c b/gcc/testsuite/gcc.dg/tree-prof/pr50907.c
index b850513a13b..8bca6c38439 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/pr50907.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/pr50907.c
@@ -1,5 +1,5 @@
 /* PR middle-end/50907 */
 /* { dg-require-effective-target freorder } */
-/* { dg-options "-O2 -freorder-blocks-and-partition -fschedule-insns -fselective-scheduling -fpic" { target { { powerpc*-*-* ia64-*-* x86_64-*-* } && fpic } } } */
+/* { dg-options "-O2 -freorder-blocks-and-partition -fschedule-insns -fselective-scheduling -fpic" { target { { powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } && fpic } } } */
 
 #include "pr45354.c"
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-16.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-16.c
index 50fa333303b..68ef26d1191 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-16.c
@@ -3,7 +3,7 @@
    and we may use 64-bit variable to represent them.  */
 
 /* { dg-options "-O2 -fdump-tree-optimized" } */
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 
 unsigned a[100];
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-18.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-18.c
index ca75db941e5..b36d84dcb44 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-18.c
@@ -3,7 +3,7 @@
    i is first extended to 64-bit type).  */
 
 /* { dg-options "-O2 -fdump-tree-optimized" } */
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 
 unsigned bar(void);
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr44423.c b/gcc/testsuite/gcc.dg/tree-ssa/pr44423.c
index 6232d64963a..cadcfcd93a7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr44423.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr44423.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target x86_64-*-* } } */
-/* { dg-options "-O2 -fdump-tree-esra-details" } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-msse -O2 -fdump-tree-esra-details" } */
 
 #include "xmmintrin.h"
 
diff --git a/gcc/testsuite/gcc.misc-tests/godump-1.c b/gcc/testsuite/gcc.misc-tests/godump-1.c
index eb45e8ccf72..4ab39064843 100644
--- a/gcc/testsuite/gcc.misc-tests/godump-1.c
+++ b/gcc/testsuite/gcc.misc-tests/godump-1.c
@@ -2,7 +2,7 @@
 
 /* { dg-options "-c -fdump-go-spec=godump-1.out" } */
 /* { dg-do compile } */
-/* { dg-skip-if "not supported for target" { ! "s390*-*-* x86_64-*-*" } } */
+/* { dg-skip-if "not supported for target" { ! "s390*-*-* i?86-*-* x86_64-*-*" } } */
 /* { dg-skip-if "not supported for target" { ! lp64 } } */
 
 #include <stdint.h>
diff --git a/gcc/testsuite/gcc.misc-tests/linkage.exp b/gcc/testsuite/gcc.misc-tests/linkage.exp
index 1e0a94b1866..31bb27722fa 100644
--- a/gcc/testsuite/gcc.misc-tests/linkage.exp
+++ b/gcc/testsuite/gcc.misc-tests/linkage.exp
@@ -44,8 +44,7 @@ if { [isnative] && ![is_remote host] } then {
 		set native_cflags "-xarch=v9"
 	    }
 	}
-	if  {[istarget "i?86*-*-solaris2*"]
-	     || [istarget "x86_64-*-solaris2.1\[0-9\]*"]} {
+	if  {[istarget "i?86*-*-solaris2*"] || [istarget "x86_64-*-solaris2.1\[0-9\]*"]} {
 	    set file_string [exec file "linkage-x.o"]
 	    if [ string match "*64*" $file_string ] {
 		set native_cflags "-xarch=amd64"
@@ -59,9 +58,8 @@ if { [isnative] && ![is_remote host] } then {
 	    if [ string match "*64-bit*" $file_string ] {
 		set native_cflags "-m64"
 	    }
-	} elseif {[istarget "i*86-*-linux*"]
-		  || [istarget "i*86-*-gnu*"]
-		  || [istarget "x86_64-*-linux*"]} then {
+	} elseif {[istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"]
+		  || [istarget "i?86-*-gnu*"] || [istarget "x86_64-*-gnu*"] } then {
 	    set file_string [exec file "linkage-x.o"]
 	    if [ string match "*32-bit*" $file_string ] {
 		set native_cflags "-m32"
diff --git a/gcc/testsuite/gfortran.dg/PR24188.f b/gcc/testsuite/gfortran.dg/PR24188.f
index a33141fa4e0..bcac050cca7 100644
--- a/gcc/testsuite/gfortran.dg/PR24188.f
+++ b/gcc/testsuite/gfortran.dg/PR24188.f
@@ -1,7 +1,6 @@
 C PR target/24188
 C { dg-do compile }
 C { dg-options "-O2" }
-C { dg-options "-O2 -mcmodel=medium" { target { x86_64-*-* && lp64 } } }
-C { dg-options "-O2 -mcmodel=medium" { target { i?86-*-* && lp64 } } }
+C { dg-options "-O2 -mcmodel=medium" { target { { i?86-*-* x86_64-*-* } && lp64 } } }
       WRITE(6,*) ''
       END
diff --git a/gcc/testsuite/gfortran.dg/errnocheck_1.f90 b/gcc/testsuite/gfortran.dg/errnocheck_1.f90
index d9cf994e164..9990e5a180f 100644
--- a/gcc/testsuite/gfortran.dg/errnocheck_1.f90
+++ b/gcc/testsuite/gfortran.dg/errnocheck_1.f90
@@ -1,4 +1,4 @@
-! { dg-do compile { target x86_64-*-* } }
+! { dg-do compile { target i?86-*-* x86_64-*-* } }
 ! Fortran should default to -fno-math-errno
 ! and thus no call to sqrt in asm
 subroutine mysqrt(a)
diff --git a/gcc/testsuite/gfortran.dg/g77/20010216-1.f b/gcc/testsuite/gfortran.dg/g77/20010216-1.f
index af2c03a0583..7874da2ad02 100644
--- a/gcc/testsuite/gfortran.dg/g77/20010216-1.f
+++ b/gcc/testsuite/gfortran.dg/g77/20010216-1.f
@@ -1,7 +1,7 @@
 C Test for bug in reg-stack handling conditional moves.
 C Reported by Tim Prince <tprince@computer.org>
 C
-C { dg-do run { target { { i[6789]86-*-* x86_64-*-* } && ia32 } } }
+C { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } }
 C { dg-options "-ffast-math -march=pentiumpro" }
 
       double precision function foo(x, y)
diff --git a/gcc/testsuite/gfortran.dg/pr42246-2.f b/gcc/testsuite/gfortran.dg/pr42246-2.f
index 885e3a4abb0..e8f18d27e9b 100644
--- a/gcc/testsuite/gfortran.dg/pr42246-2.f
+++ b/gcc/testsuite/gfortran.dg/pr42246-2.f
@@ -1,5 +1,5 @@
 C PR rtl-optimization/42246
-C { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } }
+C { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } }
 C { dg-options "-O2 -fselective-scheduling -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops" }
 
       subroutine distance(x,clo)
diff --git a/gcc/testsuite/gfortran.dg/pr42294.f b/gcc/testsuite/gfortran.dg/pr42294.f
index 9464379083d..b22bf45ae6b 100644
--- a/gcc/testsuite/gfortran.dg/pr42294.f
+++ b/gcc/testsuite/gfortran.dg/pr42294.f
@@ -1,5 +1,5 @@
 C PR rtl-optimization/42294
-C { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } }
+C { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } }
 C { dg-options "-O2 -fselective-scheduling2 -fsel-sched-pipelining -funroll-all-loops" }
 
       SUBROUTINE ORIEN(IW,NATOT,NTOTORB,NATORB,P,T)
diff --git a/gcc/testsuite/gfortran.dg/pr44691.f b/gcc/testsuite/gfortran.dg/pr44691.f
index dc57c44586e..b256bd6bfa8 100644
--- a/gcc/testsuite/gfortran.dg/pr44691.f
+++ b/gcc/testsuite/gfortran.dg/pr44691.f
@@ -1,5 +1,5 @@
 C PR rtl-optimization/44691
-C { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } }
+C { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } }
 C { dg-options "-O2 -fselective-scheduling2" }
 
       SUBROUTINE ORIEN(IW,NATOT,NTOTORB,NATORB,P,T)
diff --git a/gcc/testsuite/gfortran.dg/vect/pr45714-a.f b/gcc/testsuite/gfortran.dg/vect/pr45714-a.f
index dd99d1fe56a..4800b41296c 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr45714-a.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr45714-a.f
@@ -1,4 +1,4 @@
-! { dg-do compile { target x86_64-*-* } }
+! { dg-do compile { target i?86-*-* x86_64-*-* } }
 ! { dg-options "-O3 -march=core2 -mavx -ffast-math -mveclibabi=svml" }
 
       integer index(18),i,j,k,l,ipiv(18),info,ichange,neq,lda,ldb,
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 4398345eb8a..3361c2f9e8d 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -509,7 +509,7 @@ proc check_profiling_available { test_what } {
     if {![info exists profiling_available_saved]} {
 	# Some targets don't have any implementation of __bb_init_func or are
 	# missing other needed machinery.
-	if {    [istarget aarch64*-*-elf]
+	if {[istarget aarch64*-*-elf]
 	     || [istarget am3*-*-linux*]
 	     || [istarget arm*-*-eabi*]
 	     || [istarget arm*-*-elf]
@@ -2097,11 +2097,10 @@ proc check_effective_target_vect_int { } {
 	verbose "check_effective_target_vect_int: using cached result" 2
     } else {
 	set et_vect_int_saved 0
-	if { [istarget i?86-*-*]
+	if { [istarget i?86-*-*] || [istarget x86_64-*-*]
              || ([istarget powerpc*-*-*]
                   && ![istarget powerpc-*-linux*paired*])
 	      || [istarget spu-*-*]
-	      || [istarget x86_64-*-*]
 	      || [istarget sparc*-*-*]
 	      || [istarget alpha*-*-*]
 	      || [istarget ia64-*-*] 
@@ -2127,10 +2126,9 @@ proc check_effective_target_vect_intfloat_cvt { } {
         verbose "check_effective_target_vect_intfloat_cvt: using cached result" 2
     } else {
         set et_vect_intfloat_cvt_saved 0
-        if { [istarget i?86-*-*]
+        if { [istarget i?86-*-*] || [istarget x86_64-*-*]
               || ([istarget powerpc*-*-*]
                    && ![istarget powerpc-*-linux*paired*])
-              || [istarget x86_64-*-*] 
               || ([istarget arm*-*-*]
                   && [check_effective_target_arm_neon_ok])} {
            set et_vect_intfloat_cvt_saved 1
@@ -2165,10 +2163,9 @@ proc check_effective_target_vect_uintfloat_cvt { } {
         verbose "check_effective_target_vect_uintfloat_cvt: using cached result" 2
     } else {
         set et_vect_uintfloat_cvt_saved 0
-        if { [istarget i?86-*-*]
+        if { [istarget i?86-*-*] || [istarget x86_64-*-*]
 	      || ([istarget powerpc*-*-*]
 		  && ![istarget powerpc-*-linux*paired*])
-	      || [istarget x86_64-*-*] 
 	      || [istarget aarch64*-*-*]
 	      || ([istarget arm*-*-*]
 		  && [check_effective_target_arm_neon_ok])} {
@@ -2191,10 +2188,9 @@ proc check_effective_target_vect_floatint_cvt { } {
         verbose "check_effective_target_vect_floatint_cvt: using cached result" 2
     } else {
         set et_vect_floatint_cvt_saved 0
-        if { [istarget i?86-*-*]
+        if { [istarget i?86-*-*] || [istarget x86_64-*-*]
               || ([istarget powerpc*-*-*]
                    && ![istarget powerpc-*-linux*paired*])
-              || [istarget x86_64-*-*]
               || ([istarget arm*-*-*]
                   && [check_effective_target_arm_neon_ok])} {
            set et_vect_floatint_cvt_saved 1
@@ -3323,8 +3319,7 @@ proc check_effective_target_vect_shift { } {
 	if { ([istarget powerpc*-*-*]
              && ![istarget powerpc-*-linux*paired*])
 	     || [istarget ia64-*-*]
-	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget aarch64*-*-*]
 	     || [check_effective_target_arm32]
 	     || ([istarget mips*-*-*]
@@ -3338,7 +3333,7 @@ proc check_effective_target_vect_shift { } {
 }
 
 proc check_effective_target_whole_vector_shift { } {
-    if { [istarget x86_64-*-*]
+    if { [istarget i?86-*-*] || [istarget x86_64-*-*]
 	 || [istarget ia64-*-*]
 	 || ([check_effective_target_arm32]
 	     && [check_effective_target_arm_little_endian])
@@ -3399,11 +3394,10 @@ proc check_effective_target_vect_shift_char { } {
 # This can change for different subtargets so do not cache the result.
 
 proc check_effective_target_vect_long { } {
-    if { [istarget i?86-*-*]
+    if { [istarget i?86-*-*] || [istarget x86_64-*-*]
 	 || (([istarget powerpc*-*-*] 
               && ![istarget powerpc-*-linux*paired*]) 
               && [check_effective_target_ilp32])
-	 || [istarget x86_64-*-*]
 	 || [check_effective_target_arm32]
 	 || ([istarget sparc*-*-*] && [check_effective_target_ilp32]) } {
 	set answer 1
@@ -3426,12 +3420,11 @@ proc check_effective_target_vect_float { } {
 	verbose "check_effective_target_vect_float: using cached result" 2
     } else {
 	set et_vect_float_saved 0
-	if { [istarget i?86-*-*]
+	if { [istarget i?86-*-*] || [istarget x86_64-*-*]
 	      || [istarget powerpc*-*-*]
 	      || [istarget spu-*-*]
 	      || [istarget mips-sde-elf]
 	      || [istarget mipsisa64*-*-*]
-	      || [istarget x86_64-*-*]
 	      || [istarget ia64-*-*]
 	      || [istarget aarch64*-*-*]
 	      || [check_effective_target_arm32] } {
@@ -3454,9 +3447,8 @@ proc check_effective_target_vect_double { } {
 	verbose "check_effective_target_vect_double: using cached result" 2
     } else {
 	set et_vect_double_saved 0
-	if { [istarget i?86-*-*]
-	      || [istarget aarch64*-*-*]
-	      || [istarget x86_64-*-*] } {
+	if { [istarget i?86-*-*] || [istarget x86_64-*-*]
+	     || [istarget aarch64*-*-*] } {
 	   if { [check_no_compiler_messages vect_double assembly {
 		 #ifdef __tune_atom__
 		 # error No double vectorizer support.
@@ -3486,8 +3478,7 @@ proc check_effective_target_vect_long_long { } {
         verbose "check_effective_target_vect_long_long: using cached result" 2
     } else {
         set et_vect_long_long_saved 0
-        if { [istarget i?86-*-*]
-              || [istarget x86_64-*-*] } {
+        if { [istarget i?86-*-*] || [istarget x86_64-*-*] } {
            set et_vect_long_long_saved 1
         }
     }
@@ -3575,8 +3566,7 @@ proc check_effective_target_vect_perm { } {
 	     || [istarget aarch64*-*-*]
 	     || [istarget powerpc*-*-*]
              || [istarget spu-*-*]
-	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || ([istarget mips*-*-*]
 		 && [check_effective_target_mpaired_single]) } {
             set et_vect_perm_saved 1
@@ -3780,8 +3770,7 @@ proc check_effective_target_vect_widen_mult_hi_to_si { } {
 	      || [istarget spu-*-*]
 	      || [istarget ia64-*-*]
 	      || [istarget aarch64*-*-*]
-	      || [istarget i?86-*-*]
-	      || [istarget x86_64-*-*]
+	      || [istarget i?86-*-*] || [istarget x86_64-*-*]
               || ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok]) } {
             set et_vect_widen_mult_hi_to_si_saved 1
         }
@@ -3828,8 +3817,7 @@ proc check_effective_target_vect_widen_mult_hi_to_si_pattern { } {
         if { [istarget powerpc*-*-*]
               || [istarget spu-*-*]
               || [istarget ia64-*-*]
-              || [istarget i?86-*-*]
-              || [istarget x86_64-*-*]
+              || [istarget i?86-*-*] || [istarget x86_64-*-*]
               || ([istarget arm*-*-*]
 		  && [check_effective_target_arm_neon_ok]
 		  && [check_effective_target_arm_little_endian]) } {
@@ -3853,8 +3841,7 @@ proc check_effective_target_vect_widen_mult_si_to_di_pattern { } {
     } else {
 	set et_vect_widen_mult_si_to_di_pattern_saved 0
         if {[istarget ia64-*-*]
-	    || [istarget i?86-*-*]
-	    || [istarget x86_64-*-*] } {
+	    || [istarget i?86-*-*] || [istarget x86_64-*-*] } {
             set et_vect_widen_mult_si_to_di_pattern_saved 1
         }
     }
@@ -3937,8 +3924,7 @@ proc check_effective_target_vect_sdot_hi { } {
         set et_vect_sdot_hi_saved 0
         if { ([istarget powerpc*-*-*] && ![istarget powerpc-*-linux*paired*])
 	     || [istarget ia64-*-*]
-	     || [istarget i?86-*-*]
-             || [istarget x86_64-*-*] } {
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*] } {
             set et_vect_sdot_hi_saved 1
         }
     }
@@ -3978,8 +3964,7 @@ proc check_effective_target_vect_usad_char { } {
         verbose "check_effective_target_vect_usad_char: using cached result" 2
     } else {
         set et_vect_usad_char_saved 0
-        if { ([istarget i?86-*-*]
-             || [istarget x86_64-*-*]) } {
+        if { ([istarget i?86-*-*] || [istarget x86_64-*-*]) } {
             set et_vect_usad_char_saved 1
         }
     }
@@ -4001,8 +3986,7 @@ proc check_effective_target_vect_pack_trunc { } {
     } else {
         set et_vect_pack_trunc_saved 0
         if { ([istarget powerpc*-*-*] && ![istarget powerpc-*-linux*paired*])
-             || [istarget i?86-*-*]
-             || [istarget x86_64-*-*]
+             || [istarget i?86-*-*] || [istarget x86_64-*-*]
              || [istarget aarch64*-*-*]
              || [istarget spu-*-*]
              || ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok]
@@ -4027,8 +4011,7 @@ proc check_effective_target_vect_unpack { } {
     } else {
         set et_vect_unpack_saved 0
         if { ([istarget powerpc*-*-*] && ![istarget powerpc-*paired*])
-             || [istarget i?86-*-*]
-             || [istarget x86_64-*-*] 
+             || [istarget i?86-*-*] || [istarget x86_64-*-*] 
              || [istarget spu-*-*]
              || [istarget ia64-*-*]
              || [istarget aarch64*-*-*]
@@ -4095,9 +4078,8 @@ proc check_effective_target_vect_hw_misalign { } {
         verbose "check_effective_target_vect_hw_misalign: using cached result" 2
     } else {
         set et_vect_hw_misalign_saved 0
-       if { ([istarget x86_64-*-*] 
-	    || [istarget aarch64*-*-*]
-            || [istarget i?86-*-*]) } {
+       if { [istarget i?86-*-*] || [istarget x86_64-*-*]
+	    || [istarget aarch64*-*-*] } {
           set et_vect_hw_misalign_saved 1
        }
     }
@@ -4269,9 +4251,8 @@ proc check_effective_target_vect_condition { } {
 	if { [istarget aarch64*-*-*]
 	     || [istarget powerpc*-*-*]
 	     || [istarget ia64-*-*]
-	     || [istarget i?86-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget spu-*-*]
-	     || [istarget x86_64-*-*]
 	     || ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok]) } {
 	   set et_vect_cond_saved 1
 	}
@@ -4291,8 +4272,7 @@ proc check_effective_target_vect_cond_mixed { } {
 	verbose "check_effective_target_vect_cond_mixed: using cached result" 2
     } else {
 	set et_vect_cond_mixed_saved 0
-	if { [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	if { [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget powerpc*-*-*] } {
 	   set et_vect_cond_mixed_saved 1
 	}
@@ -4313,8 +4293,7 @@ proc check_effective_target_vect_char_mult { } {
 	set et_vect_char_mult_saved 0
 	if { [istarget aarch64*-*-*]
 	     || [istarget ia64-*-*]
-	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
             || [check_effective_target_arm32] } {
 	   set et_vect_char_mult_saved 1
 	}
@@ -4335,8 +4314,7 @@ proc check_effective_target_vect_short_mult { } {
 	set et_vect_short_mult_saved 0
 	if { [istarget ia64-*-*]
 	     || [istarget spu-*-*]
-	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget powerpc*-*-*]
 	     || [istarget aarch64*-*-*]
 	     || [check_effective_target_arm32]
@@ -4361,8 +4339,7 @@ proc check_effective_target_vect_int_mult { } {
 	set et_vect_int_mult_saved 0
 	if { ([istarget powerpc*-*-*] && ![istarget powerpc-*-linux*paired*])
 	     || [istarget spu-*-*]
-	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget ia64-*-*]
 	     || [istarget aarch64*-*-*]
 	     || [check_effective_target_arm32] } {
@@ -4386,8 +4363,7 @@ proc check_effective_target_vect_extract_even_odd { } {
 	if { [istarget aarch64*-*-*]
 	     || [istarget powerpc*-*-*]
 	     || [is-effective-target arm_neon_ok]
-             || [istarget i?86-*-*]
-             || [istarget x86_64-*-*]
+             || [istarget i?86-*-*] || [istarget x86_64-*-*]
              || [istarget ia64-*-*]
              || [istarget spu-*-*]
 	     || ([istarget mips*-*-*]
@@ -4412,8 +4388,7 @@ proc check_effective_target_vect_interleave { } {
 	if { [istarget aarch64*-*-*]
 	     || [istarget powerpc*-*-*]
 	     || [is-effective-target arm_neon_ok]
-             || [istarget i?86-*-*]
-             || [istarget x86_64-*-*]
+             || [istarget i?86-*-*] || [istarget x86_64-*-*]
              || [istarget ia64-*-*]
              || [istarget spu-*-*]
 	     || ([istarget mips*-*-*]
@@ -4502,8 +4477,7 @@ proc check_effective_target_vect_call_copysignf { } {
 	verbose "check_effective_target_vect_call_copysignf: using cached result" 2
     } else {
 	set et_vect_call_copysignf_saved 0
-	if { [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	if { [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget powerpc*-*-*] } {
 	   set et_vect_call_copysignf_saved 1
 	}
@@ -4523,8 +4497,7 @@ proc check_effective_target_vect_call_sqrtf { } {
     } else {
 	set et_vect_call_sqrtf_saved 0
 	if { [istarget aarch64*-*-*]
-	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || ([istarget powerpc*-*-*] && [check_vsx_hw_available]) } {
 	    set et_vect_call_sqrtf_saved 1
 	}
@@ -4538,7 +4511,8 @@ proc check_effective_target_vect_call_sqrtf { } {
 
 proc check_effective_target_vect_call_lrint { } {
     set et_vect_call_lrint 0
-    if { ([istarget i?86-*-*] || [istarget x86_64-*-*]) && [check_effective_target_ilp32] } {
+    if { ([istarget i?86-*-*] || [istarget x86_64-*-*])
+	 && [check_effective_target_ilp32] } {
 	set et_vect_call_lrint 1
     }
 
@@ -4820,8 +4794,7 @@ proc check_effective_target_sync_int_128_runtime { } {
 # Note: 32bit x86 targets require -march=pentium in dg-options.
 
 proc check_effective_target_sync_long_long { } {
-    if { [istarget x86_64-*-*]
-	 || [istarget i?86-*-*])
+    if { [istarget x86_64-*-*] || [istarget i?86-*-*])
 	 || [istarget aarch64*-*-*]
 	 || [istarget arm*-*-*]
 	 || [istarget alpha*-*-*]
@@ -4838,8 +4811,7 @@ proc check_effective_target_sync_long_long { } {
 # Note: 32bit x86 targets require -march=pentium in dg-options.
 
 proc check_effective_target_sync_long_long_runtime { } {
-    if { [istarget x86_64-*-*]
-	 || [istarget i?86-*-*] } {
+    if { [istarget x86_64-*-*] || [istarget i?86-*-*] } {
 	return [check_cached_effective_target sync_long_long_available {
 	    check_runtime_nocache sync_long_long_available {
 		#include "cpuid.h"
@@ -4895,12 +4867,11 @@ proc check_effective_target_bswap { } {
 	if { [istarget aarch64-*-*]
 	     || [istarget alpha*-*-*]
 	     || [istarget arm*-*-*]
-	     || [istarget i?86-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget m68k-*-*]
 	     || [istarget powerpc*-*-*]
 	     || [istarget rs6000-*-*]
-	     || [istarget s390*-*-*]
-	     || [istarget x86_64-*-*] } {
+	     || [istarget s390*-*-*] } {
 	    set et_bswap_saved 1
 	}
     }
@@ -4920,8 +4891,7 @@ proc check_effective_target_bswap16 { } {
 	set et_bswap16_saved 0
 	if { [is-effective-target bswap]
 	     && ![istarget alpha*-*-*]
-	     && ![istarget i?86-*-*]
-	     && ![istarget x86_64-*-*] } {
+	     && !([istarget i?86-*-*] || [istarget x86_64-*-*]) } {
 	   set et_bswap16_saved 1
 	}
     }
@@ -4979,8 +4949,7 @@ proc check_effective_target_sync_int_long { } {
 # This is intentionally powerpc but not rs6000, rs6000 doesn't have the
 # load-reserved/store-conditional instructions.
         if { [istarget ia64-*-*]
-	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget aarch64*-*-*]
 	     || [istarget alpha*-*-*] 
 	     || [istarget arm*-*-linux-*] 
@@ -5012,8 +4981,7 @@ proc check_effective_target_sync_char_short { } {
 # load-reserved/store-conditional instructions.
         if { [istarget aarch64*-*-*]
 	     || [istarget ia64-*-*]
-	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*]
+	     || [istarget i?86-*-*] || [istarget x86_64-*-*]
 	     || [istarget alpha*-*-*] 
 	     || [istarget arm*-*-linux-*] 
 	     || [istarget hppa*-*linux*]