testsuite/i386: Cleanup target selectors in i386 target directory.

diff --git a/gcc/testsuite/g++.target/i386/empty-class2.C b/gcc/testsuite/g++.target/i386/empty-class2.C
index b9317c56706..3e4fc4e709c 100644
--- a/gcc/testsuite/g++.target/i386/empty-class2.C
+++ b/gcc/testsuite/g++.target/i386/empty-class2.C
@@ -2,7 +2,6 @@ 
 // Test passing aligned empty aggregate
 // { dg-do compile }
 // { dg-options "-O2" }
-// { dg-additional-options "-Wno-psabi" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
 
 struct S { union {} a; } __attribute__((aligned));
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512fp16-reduce-op-2.c b/gcc/testsuite/gcc.target/i386/avx512fp16-reduce-op-2.c
index 72e4a814a76..924f1a94138 100644
--- a/gcc/testsuite/gcc.target/i386/avx512fp16-reduce-op-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512fp16-reduce-op-2.c
@@ -1,6 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-O2 -mprefer-vector-width=512 -fdump-tree-optimized" } */
-/* { dg-additional-options "-msse2" { target i?86-*-* } } */
+/* { dg-options "-O2 -msse2 -mprefer-vector-width=512 -fdump-tree-optimized" } */
 
 /* { dg-final { scan-tree-dump-times "\.REDUC_PLUS" 3 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\.REDUC_MIN" 3 "optimized" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr103541.c b/gcc/testsuite/gcc.target/i386/pr103541.c
index 72b257d42ee..56ecb289fa1 100644
--- a/gcc/testsuite/gcc.target/i386/pr103541.c
+++ b/gcc/testsuite/gcc.target/i386/pr103541.c
@@ -1,5 +1,5 @@ 
 /* PR rtl-optimization/103541 */
-/* { dg-do compile  { target x86_64-*-* } } */
+/* { dg-do compile  { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 
 float a;
diff --git a/gcc/testsuite/gcc.target/i386/pr108774.c b/gcc/testsuite/gcc.target/i386/pr108774.c
index 482bc490cde..0bd2aed7327 100644
--- a/gcc/testsuite/gcc.target/i386/pr108774.c
+++ b/gcc/testsuite/gcc.target/i386/pr108774.c
@@ -1,5 +1,5 @@ 
 /* PR target/108774 */
-/* { dg-do compile  { target x86_64-*-* } } */
+/* { dg-do compile  { target lp64 } } */
 /* { dg-options "-Os -ftrapv -mcmodel=large" } */
 
 int i, j;
diff --git a/gcc/testsuite/gcc.target/i386/pr85593.c b/gcc/testsuite/gcc.target/i386/pr85593.c
index 092f9cbe680..6be6849bb33 100644
--- a/gcc/testsuite/gcc.target/i386/pr85593.c
+++ b/gcc/testsuite/gcc.target/i386/pr85593.c
@@ -1,5 +1,5 @@ 
 /* PR target/85593 */
-/* { dg-do run { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */
+/* { dg-do run { target { *-*-linux* && lp64 } } } */
 /* { dg-options "-O2" } */
 
 __attribute__((naked)) void
diff --git a/gcc/testsuite/gcc.target/i386/pr90007.c b/gcc/testsuite/gcc.target/i386/pr90007.c
index a16eec308fb..ad099ed0a78 100644
--- a/gcc/testsuite/gcc.target/i386/pr90007.c
+++ b/gcc/testsuite/gcc.target/i386/pr90007.c
@@ -1,5 +1,5 @@ 
 /* PR rtl-optimization/90007 */
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-march=bdver1 -mfpmath=387 -O1 -fschedule-insns -fselective-scheduling" } */
 
 void
diff --git a/gcc/testsuite/gcc.target/i386/pr92841-2.c b/gcc/testsuite/gcc.target/i386/pr92841-2.c
index b2d5eb86389..7d30028db7a 100644
--- a/gcc/testsuite/gcc.target/i386/pr92841-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr92841-2.c
@@ -1,5 +1,5 @@ 
 /* PR target/92841 */
-/* { dg-do compile { target { { { *-*-linux* } && lp64 } && fstack_protector } } } */
+/* { dg-do compile { target { { *-*-linux* && lp64 } && fstack_protector } } } */
 /* { dg-options "-O2 -fpic -fstack-protector-strong -masm=att" } */
 /* { dg-final { scan-assembler "leaq\tbuf2\\\(%rip\\\)," } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr95464.c b/gcc/testsuite/gcc.target/i386/pr95464.c
index 33a8290e0cf..300a9085106 100644
--- a/gcc/testsuite/gcc.target/i386/pr95464.c
+++ b/gcc/testsuite/gcc.target/i386/pr95464.c
@@ -1,5 +1,5 @@ 
 /* { dg-options "-O2" } */
-/* { dg-do run { target { { *-*-linux* } && { ! ia32 } } } } */
+/* { dg-do run { target { *-*-linux* && { ! ia32 } } } } */
 
 struct S { unsigned a:1, b:1, c:1, d:1, e:14, f:14; };
 
diff --git a/gcc/testsuite/gcc.target/i386/pr98063.c b/gcc/testsuite/gcc.target/i386/pr98063.c
index f76435a7194..781a1dc3d18 100644
--- a/gcc/testsuite/gcc.target/i386/pr98063.c
+++ b/gcc/testsuite/gcc.target/i386/pr98063.c
@@ -1,5 +1,5 @@ 
 /* PR target/98063 */
-/* { dg-do run { target { i?86-*-linux* x86_64-*-linux* } } } */
+/* { dg-do run { target *-*-linux* } } */
 /* { dg-require-effective-target lp64 } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -fpic -mcmodel=large -fno-plt -save-temps" } */
diff --git a/gcc/testsuite/gcc.target/i386/pr99464.c b/gcc/testsuite/gcc.target/i386/pr99464.c
index 3c1ac6f9a6c..e8f427f0dda 100644
--- a/gcc/testsuite/gcc.target/i386/pr99464.c
+++ b/gcc/testsuite/gcc.target/i386/pr99464.c
@@ -1,7 +1,6 @@ 
 /* PR target/99464 */
 /* { dg-do compile } */
-/* { dg-options "-O2" } */
-/* { dg-additional-options "-msse2" { target i?86-*-* } } */
+/* { dg-options "-O2 -msse2" } */
 
 #pragma GCC target("arch=cannonlake")
 
diff --git a/gcc/testsuite/gcc.target/i386/pr99530-1.c b/gcc/testsuite/gcc.target/i386/pr99530-1.c
index 080d7cc9399..47ab3509548 100644
--- a/gcc/testsuite/gcc.target/i386/pr99530-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr99530-1.c
@@ -1,4 +1,4 @@ 
-/* { dg-do compile { target { i?86-*-linux* x86_64-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2 -fpic -mcmodel=large -fno-plt" } */
 /* { dg-final { scan-assembler-not "foo@GOTPCREL" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr99530-2.c b/gcc/testsuite/gcc.target/i386/pr99530-2.c
index 9808957d624..baf768ae059 100644
--- a/gcc/testsuite/gcc.target/i386/pr99530-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr99530-2.c
@@ -1,4 +1,4 @@ 
-/* { dg-do compile { target { i?86-*-linux* x86_64-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2 -fno-pic -mcmodel=large -fno-plt" } */
 /* { dg-final { scan-assembler-not "foo@GOTPCREL" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr99530-3.c b/gcc/testsuite/gcc.target/i386/pr99530-3.c
index 22fe81b25f2..7d9b325cd53 100644
--- a/gcc/testsuite/gcc.target/i386/pr99530-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr99530-3.c
@@ -1,4 +1,4 @@ 
-/* { dg-do compile { target { i?86-*-linux* x86_64-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -fno-pic -fno-plt" } */
 /* { dg-final { scan-assembler "call\[ \t\]+\[*\]foo@GOTPCREL" { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]+\[*\]foo@GOT" { target { ia32 && got32x_reloc } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr99530-4.c b/gcc/testsuite/gcc.target/i386/pr99530-4.c
index aba0b5d7892..3e61fd6bfbf 100644
--- a/gcc/testsuite/gcc.target/i386/pr99530-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr99530-4.c
@@ -1,4 +1,4 @@ 
-/* { dg-do compile { target { i?86-*-linux* x86_64-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -fpic -fno-plt" } */
 /* { dg-final { scan-assembler "call\[ \t\]+\[*\]foo@GOTPCREL" { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-not "foo@GOT" { target { ia32 } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr99530-5.c b/gcc/testsuite/gcc.target/i386/pr99530-5.c
index 02c5799d273..810632d3448 100644
--- a/gcc/testsuite/gcc.target/i386/pr99530-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr99530-5.c
@@ -1,4 +1,4 @@ 
-/* { dg-do compile { target { i?86-*-linux* x86_64-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -fno-pic" } */
 /* { dg-final { scan-assembler "call\[ \t\]+\[*\]foo@GOTPCREL" { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]+\[*\]foo@GOT" { target { ia32 && got32x_reloc } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr99530-6.c b/gcc/testsuite/gcc.target/i386/pr99530-6.c
index 0dfdd3752f7..e99bc753d97 100644
--- a/gcc/testsuite/gcc.target/i386/pr99530-6.c
+++ b/gcc/testsuite/gcc.target/i386/pr99530-6.c
@@ -1,4 +1,4 @@ 
-/* { dg-do compile { target { i?86-*-linux* x86_64-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -fpic" } */
 /* { dg-final { scan-assembler "call\[ \t\]+\[*\]foo@GOTPCREL" { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-not "foo@GOT" { target { ia32 } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr99531.c b/gcc/testsuite/gcc.target/i386/pr99531.c
index 98536452488..3afd534c1ef 100644
--- a/gcc/testsuite/gcc.target/i386/pr99531.c
+++ b/gcc/testsuite/gcc.target/i386/pr99531.c
@@ -1,7 +1,7 @@ 
-/* { dg-do compile { target { x86_64-*-linux* } } } */
+/* { dg-do compile { target { *-*-linux* && { ! ia32 } } } } */
 /* { dg-options "-O2" } */
 
 int func(int, int, int, int, int, int);
 int caller(int a, int b, int c, int d, int e) { return func(0, a, b, c, d, e); }
 
-/* { dg-final { scan-assembler-not "push"  { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-not "push" } } */