[testsuite] : Cleanup dg-options in gcc.target/i386/ a bit

diff --git a/gcc/testsuite/gcc.target/i386/20030926-1.c b/gcc/testsuite/gcc.target/i386/20030926-1.c
index ebde34085113..f4c8f618d4c3 100644
--- a/gcc/testsuite/gcc.target/i386/20030926-1.c
+++ b/gcc/testsuite/gcc.target/i386/20030926-1.c
@@ -1,7 +1,7 @@ 
 /* PR optimization/11741  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -minline-all-stringops" } */
-/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target ia32 } } */
+/* { dg-additional-options "-march=pentium4" { target ia32 } } */
 
 extern void *memcpy (void *, const void *, __SIZE_TYPE__);
 extern __SIZE_TYPE__ strlen (const char *);
diff --git a/gcc/testsuite/gcc.target/i386/abi-2.c b/gcc/testsuite/gcc.target/i386/abi-2.c
index 39eafc250396..72a17eca31fc 100644
--- a/gcc/testsuite/gcc.target/i386/abi-2.c
+++ b/gcc/testsuite/gcc.target/i386/abi-2.c
@@ -1,7 +1,7 @@ 
 /* Make certain that we pass __m256i in the correct register for AVX.  */
 /* { dg-do compile } */
 /* { dg-options "-O1 -mavx" } */
-/* { dg-options "-mabi=sysv -O1 -mavx" { target x86_64-*-mingw* } } */
+/* { dg-additional-options "-mabi=sysv" { target x86_64-*-mingw* } } */
 
 typedef long long __m256i __attribute__ ((__vector_size__ (32)));
 __m256i foo (void) { return (__m256i){ 1, 2, 3, 4 }; }
diff --git a/gcc/testsuite/gcc.target/i386/asm-6.c b/gcc/testsuite/gcc.target/i386/asm-6.c
index 6aa37ef4276a..225e3193f7ad 100644
--- a/gcc/testsuite/gcc.target/i386/asm-6.c
+++ b/gcc/testsuite/gcc.target/i386/asm-6.c
@@ -1,8 +1,8 @@ 
 /* PR rtl-optimization/44174 */
 /* Testcase by Jakub Jelinek <jakub@gcc.gnu.org> */
 
-/* { dg-do compile } */
-/* { dg-options "-O2 -fpic" { target fpic } } */
+/* { dg-do compile { target fpic } } */
+/* { dg-options "-O2 -fpic" } */
 
 int f0 (int, int, int, int, int);
 int f1 (void);
diff --git a/gcc/testsuite/gcc.target/i386/bitfield1.c b/gcc/testsuite/gcc.target/i386/bitfield1.c
index 714792c3d026..ecc7efe64010 100644
--- a/gcc/testsuite/gcc.target/i386/bitfield1.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield1.c
@@ -1,8 +1,7 @@ 
 // Test for bitfield alignment in structs on IA-32
 // { dg-do run }
 // { dg-require-effective-target ia32 }
-// { dg-options "-O2" }
-// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-* x86_64-*-* } }
+// { dg-options "-O2 -mno-align-double -mno-ms-bitfields" }
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/bitfield2.c b/gcc/testsuite/gcc.target/i386/bitfield2.c
index 5784bf0ccb45..58f7cea1b603 100644
--- a/gcc/testsuite/gcc.target/i386/bitfield2.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield2.c
@@ -1,8 +1,7 @@ 
 // Test for bitfield alignment in structs on IA-32
 // { dg-do run }
 // { dg-require-effective-target ia32 }
-// { dg-options "-O2" }
-// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-* x86_64-*-* } }
+// { dg-options "-O2 -mno-align-double -mno-ms-bitfields" }
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/bittest.c b/gcc/testsuite/gcc.target/i386/bittest.c
index 7b7ce9eed105..79c389718591 100644
--- a/gcc/testsuite/gcc.target/i386/bittest.c
+++ b/gcc/testsuite/gcc.target/i386/bittest.c
@@ -19,4 +19,4 @@  gate_rtl_cprop (void)
    memory and mask off bits are unnecessary.  In theory we can just count
    the move-with-extension, and and testb instructions.  There should be
    only one.  */
-/* { dg-final { scan-assembler-times "movzbl|and|testb" 1 { target { i?86-*-* x86_64-*-*} } } } */
+/* { dg-final { scan-assembler-times "movzbl|and|testb" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/darwin-fpmath.c b/gcc/testsuite/gcc.target/i386/darwin-fpmath.c
index 693bdee01f25..5b047010bd14 100644
--- a/gcc/testsuite/gcc.target/i386/darwin-fpmath.c
+++ b/gcc/testsuite/gcc.target/i386/darwin-fpmath.c
@@ -1,4 +1,4 @@ 
-/* { dg-do compile { target i?86-*-darwin* x86_64-*-darwin* } } */
+/* { dg-do compile { target *-*-darwin* } } */
 /* { dg-final { scan-assembler "addsd" } } */
 /* Do not add -msse or -msse2 or -mfpmath=sse to the options.  GCC is
    supposed to use SSE math on Darwin by default, and libm won't work
diff --git a/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c b/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c
index f59253a5d5d6..ae2df2870600 100644
--- a/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c
+++ b/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c
@@ -1,6 +1,7 @@ 
 /* { dg-do compile } */
-/* { dg-options "-O3 -mgeneral-regs-only -mno-cld -mpreferred-stack-boundary=3" { target { ! { ia32 } } } } */
-/* { dg-options "-O3 -mgeneral-regs-only -mno-cld -mpreferred-stack-boundary=2" { target { ia32 } } } */
+/* { dg-options "-O3 -mgeneral-regs-only -mno-cld" } */
+/* { dg-additional-options "-mpreferred-stack-boundary=3" { target { ! ia32 } } }  */
+/* { dg-additional-options "-mpreferred-stack-boundary=2" { target { ia32 } } } */
 
 extern void foo (void *) __attribute__ ((interrupt));
 extern void bar (void) __attribute__ ((no_caller_saved_registers));
diff --git a/gcc/testsuite/gcc.target/i386/mvc9.c b/gcc/testsuite/gcc.target/i386/mvc9.c
index 69e3cefb7d1d..4052f2afb547 100644
--- a/gcc/testsuite/gcc.target/i386/mvc9.c
+++ b/gcc/testsuite/gcc.target/i386/mvc9.c
@@ -1,6 +1,6 @@ 
-/* { dg-do run } */
+/* { dg-do run { target lto } } */
 /* { dg-require-ifunc "" } */
-/* { dg-options "-flto -O2" { target lto } } */
+/* { dg-options "-O2 -flto" } */
 
 __attribute__((target_clones("avx","arch=slm","arch=core-avx2","default")))
 int
diff --git a/gcc/testsuite/gcc.target/i386/pr22076.c b/gcc/testsuite/gcc.target/i386/pr22076.c
index e9916c9a5832..6c1620b4a3b1 100644
--- a/gcc/testsuite/gcc.target/i386/pr22076.c
+++ b/gcc/testsuite/gcc.target/i386/pr22076.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
 /* { dg-options "-O2 -fomit-frame-pointer -flax-vector-conversions -mmmx" } */
-/* { dg-options "-O2 -fomit-frame-pointer -flax-vector-conversions -mmmx -mno-vect8-ret-in-mem" { target *-*-vxworks* } } */
+/* { dg-additional-options "-mno-vect8-ret-in-mem" { target *-*-vxworks* } } */
 
 #include <mmintrin.h>
 
diff --git a/gcc/testsuite/gcc.target/i386/pr37216.c b/gcc/testsuite/gcc.target/i386/pr37216.c
index 05eb2eea77f7..e1942fe08958 100644
--- a/gcc/testsuite/gcc.target/i386/pr37216.c
+++ b/gcc/testsuite/gcc.target/i386/pr37216.c
@@ -1,6 +1,6 @@ 
 /* { dg-do run } */
 /* { dg-options "-O3 -msse2" } */
-/* { dg-options "-O3 -msse2 -mpe-aligned-commons" { target pe_aligned_commons } } */
+/* { dg-additional-options "-mpe-aligned-commons" { target pe_aligned_commons } } */
 /* { dg-require-effective-target sse2 } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/pr39431.c b/gcc/testsuite/gcc.target/i386/pr39431.c
index 0db7d5643036..a148dd39ba5e 100644
--- a/gcc/testsuite/gcc.target/i386/pr39431.c
+++ b/gcc/testsuite/gcc.target/i386/pr39431.c
@@ -1,7 +1,7 @@ 
 /* PR target/39431 */
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -march=i686 -fpic" { target { ia32 && fpic } } } */
+/* { dg-additional-options "-march=i686 -fpic" { target { ia32 && fpic } } } */
 
 extern void bar (char *, int);
 
diff --git a/gcc/testsuite/gcc.target/i386/pr40906-1.c b/gcc/testsuite/gcc.target/i386/pr40906-1.c
index 233d8fdcb0ec..1e78c231d39d 100644
--- a/gcc/testsuite/gcc.target/i386/pr40906-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr40906-1.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run } */
 /* { dg-require-effective-target ia32 } */
-/* { dg-options "-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -mno-accumulate-outgoing-args" } */
-/* { dg-options "-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args" { target *-*-mingw* *-*-cygwin* } } */
+/* { dg-options "-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args" } */
+/* { dg-additional-options "-mno-accumulate-outgoing-args" { target { ! { *-*-mingw* *-*-cygwin* } } } } */
 
 void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/i386/pr40906-2.c b/gcc/testsuite/gcc.target/i386/pr40906-2.c
index 58b076e1f5b2..824c43254d37 100644
--- a/gcc/testsuite/gcc.target/i386/pr40906-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr40906-2.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run } */
 /* { dg-require-effective-target ia32 } */
-/* { dg-options "-O2 -Wno-psabi -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -mno-accumulate-outgoing-args -m128bit-long-double" } */
-/* { dg-options "-O2 -Wno-psabi -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -m128bit-long-double" { target *-*-mingw* *-*-cygwin* } } */
+/* { dg-options "-O2 -Wno-psabi -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -m128bit-long-double" } */
+/* { dg-additional-options "-mno-accumulate-outgoing-args" { target { ! { *-*-mingw* *-*-cygwin* } } } } */
 
 void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/i386/pr43766.c b/gcc/testsuite/gcc.target/i386/pr43766.c
index 8ac16137f78b..72898ccc6501 100644
--- a/gcc/testsuite/gcc.target/i386/pr43766.c
+++ b/gcc/testsuite/gcc.target/i386/pr43766.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -msse -mregparm=3" { target ia32 } } */
+/* { dg-additional-options "-msse -mregparm=3" { target ia32 } } */
 
 void p (int *a, int i)
 {
diff --git a/gcc/testsuite/gcc.target/i386/pr44223.c b/gcc/testsuite/gcc.target/i386/pr44223.c
index 3b8030c1bbbe..9f134e72348d 100644
--- a/gcc/testsuite/gcc.target/i386/pr44223.c
+++ b/gcc/testsuite/gcc.target/i386/pr44223.c
@@ -1,6 +1,6 @@ 
 /* PR debug/44223 */
-/* { dg-do compile } */
-/* { dg-options "-O3 -fsched-pressure -fschedule-insns -fpic -march=core2 -g" { target fpic } } */
+/* { dg-do compile { target fpic } } */
+/* { dg-options "-O3 -fsched-pressure -fschedule-insns -fpic -march=core2 -g" } */
 
 struct S { unsigned int s1; int s2; };
 struct T { int t; };
diff --git a/gcc/testsuite/gcc.target/i386/pr45234.c b/gcc/testsuite/gcc.target/i386/pr45234.c
index 3996fa27fb6b..d0579b5ea8dc 100644
--- a/gcc/testsuite/gcc.target/i386/pr45234.c
+++ b/gcc/testsuite/gcc.target/i386/pr45234.c
@@ -1,6 +1,6 @@ 
 /* PR middle-end/45234 */
-/* { dg-do compile } */
-/* { dg-options "-march=i586" { target ia32 } } */
+/* { dg-do compile { target ia32 } } */
+/* { dg-options "-march=i586" } */
 
 struct S { union { double b[4]; } a[18]; } s, a[5];
 void foo (struct S);
diff --git a/gcc/testsuite/gcc.target/i386/pr46226.c b/gcc/testsuite/gcc.target/i386/pr46226.c
index 168d80e2be40..e93cbf3dda86 100644
--- a/gcc/testsuite/gcc.target/i386/pr46226.c
+++ b/gcc/testsuite/gcc.target/i386/pr46226.c
@@ -1,6 +1,6 @@ 
 /* { dg-do run } */
-/* { dg-options "-Os -fomit-frame-pointer -mno-accumulate-outgoing-args -fno-asynchronous-unwind-tables" } */
-/* { dg-options "-Os -fomit-frame-pointer -fno-asynchronous-unwind-tables" { target *-*-mingw* *-*-cygwin* } } */
+/* { dg-options "-Os -fomit-frame-pointer -fno-asynchronous-unwind-tables" } */
+/* { dg-additional-options "-mno-accumulate-outgoing-args" { target { ! { *-*-mingw* *-*-cygwin* } } } } */
 
 extern void abort(void);
 
diff --git a/gcc/testsuite/gcc.target/i386/pr46470.c b/gcc/testsuite/gcc.target/i386/pr46470.c
index c66a378a1ad9..728ddcde8ba7 100644
--- a/gcc/testsuite/gcc.target/i386/pr46470.c
+++ b/gcc/testsuite/gcc.target/i386/pr46470.c
@@ -4,8 +4,9 @@ 
 /* These options are selected to ensure 1 word needs to be allocated
    on the stack to maintain alignment for the call.  This should be
    transformed to push+pop.  We also want to force unwind info updates.  */
-/* { dg-options "-Os -fomit-frame-pointer -fasynchronous-unwind-tables -mno-red-zone" } */
-/* { dg-options "-Os -fomit-frame-pointer -mpreferred-stack-boundary=3 -fasynchronous-unwind-tables" { target ia32 } } */
+/* { dg-options "-Os -fomit-frame-pointer -fasynchronous-unwind-tables" } */
+/* { dg-additional-options "-mno-red-zone" { target { ! ia32 } } } */
+/* { dg-additional-options "-mpreferred-stack-boundary=3" { target ia32 } } */
 /* ms_abi has reserved stack-region.  */
 /* { dg-skip-if "" { x86_64-*-mingw* } } */
 void f();
diff --git a/gcc/testsuite/gcc.target/i386/pr49866.c b/gcc/testsuite/gcc.target/i386/pr49866.c
index 823305df706c..622c8f656254 100644
--- a/gcc/testsuite/gcc.target/i386/pr49866.c
+++ b/gcc/testsuite/gcc.target/i386/pr49866.c
@@ -1,6 +1,6 @@ 
 /* PR target/49866 */
-/* { dg-do assemble } */
-/* { dg-options "-O2 -mcmodel=large" { target lp64 } } */
+/* { dg-do assemble { target lp64 } } */
+/* { dg-options "-O2 -mcmodel=large"  } */
 
 void fn (void *, int, int);
 int fn2 (void);
diff --git a/gcc/testsuite/gcc.target/i386/pr57091.c b/gcc/testsuite/gcc.target/i386/pr57091.c
index 4fc7ed769ba8..86cb5f02b610 100644
--- a/gcc/testsuite/gcc.target/i386/pr57091.c
+++ b/gcc/testsuite/gcc.target/i386/pr57091.c
@@ -1,5 +1,5 @@ 
-/* { dg-do compile } */
-/* { dg-options "-O -mcmodel=large"  { target lp64 } } */
+/* { dg-do compile { target lp64 } } */
+/* { dg-options "-O -mcmodel=large" } */
 void (*bar)();
 
 void foo (void)
diff --git a/gcc/testsuite/gcc.target/i386/pr59929.c b/gcc/testsuite/gcc.target/i386/pr59929.c
index 4591dc4d6016..53e0b237c270 100644
--- a/gcc/testsuite/gcc.target/i386/pr59929.c
+++ b/gcc/testsuite/gcc.target/i386/pr59929.c
@@ -1,6 +1,6 @@ 
 /* { dg-do run } */
 /* { dg-options "-O0 -mno-accumulate-outgoing-args" } */
-/* { dg-options "-O0 -mno-accumulate-outgoing-args -mx32 -maddress-mode=short" { target x32 } } */
+/* { dg-additional-options "-mx32 -maddress-mode=short" { target x32 } } */
 
 void
 __attribute__ ((noinline))
diff --git a/gcc/testsuite/gcc.target/i386/pr61599-2.c b/gcc/testsuite/gcc.target/i386/pr61599-2.c
index f0d46020dea1..be031c05b1fa 100644
--- a/gcc/testsuite/gcc.target/i386/pr61599-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr61599-2.c
@@ -1,6 +1,6 @@ 
 /* PR target/61599 */
 /* { dg-do compile { target lp64 } } */
-/* { dg-options "-mcmodel=medium -fdata-sections" { target lp64 } } */
+/* { dg-options "-mcmodel=medium -fdata-sections" } */
 
 /* With -mcmodel=medium, all the arrays will be treated as large data.  */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr67480.c b/gcc/testsuite/gcc.target/i386/pr67480.c
index 90e6a6e4b8dd..aa549682dbd8 100644
--- a/gcc/testsuite/gcc.target/i386/pr67480.c
+++ b/gcc/testsuite/gcc.target/i386/pr67480.c
@@ -1,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-mavx512bw -O2 -ftree-vectorize" { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-mavx512bw -O2 -ftree-vectorize" } */
 
 void
 foo(const char *in, char *out, unsigned n)
diff --git a/gcc/testsuite/gcc.target/i386/sse-10.c b/gcc/testsuite/gcc.target/i386/sse-10.c
index 798551db2aae..4d4de4f4de55 100644
--- a/gcc/testsuite/gcc.target/i386/sse-10.c
+++ b/gcc/testsuite/gcc.target/i386/sse-10.c
@@ -1,7 +1,7 @@ 
 /* PR 17930 */
 /* { dg-do run } */
-/* { dg-options "-O1 -msse2 -mfpmath=sse -mno-accumulate-outgoing-args -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" } */
-/* { dg-options "-O1 -msse2 -mfpmath=sse -fno-omit-frame-pointer" { target *-*-mingw* *-*-cygwin* } } */
+/* { dg-options "-O1 -msse2 -mfpmath=sse -fno-omit-frame-pointer" } */
+/* { dg-additional-options "-mno-accumulate-outgoing-args -mno-omit-leaf-frame-pointer" { target { ! { *-*-mingw* *-*-cygwin* } } } } */
 /* { dg-require-effective-target sse2 } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/vararg-1.c b/gcc/testsuite/gcc.target/i386/vararg-1.c
index 3eda1e93e251..cab44ed0969a 100644
--- a/gcc/testsuite/gcc.target/i386/vararg-1.c
+++ b/gcc/testsuite/gcc.target/i386/vararg-1.c
@@ -1,8 +1,7 @@ 
 /* PR middle-end/36858 */
 /* { dg-do run } */
-/* { dg-options "-w" { target { ! ia32 } } } */
-/* { dg-options "-w" { target { llp64 } } } */
-/* { dg-options "-w -msse2 -mpreferred-stack-boundary=2" { target { ia32 } } } */
+/* { dg-options "-w -msse2" } */
+/* { dg-additional-options "-mpreferred-stack-boundary=2" { target { ia32 } } } */
 /* { dg-require-effective-target sse2 } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/vararg-2.c b/gcc/testsuite/gcc.target/i386/vararg-2.c
index 65599a57561a..3010f415f828 100644
--- a/gcc/testsuite/gcc.target/i386/vararg-2.c
+++ b/gcc/testsuite/gcc.target/i386/vararg-2.c
@@ -1,8 +1,7 @@ 
 /* PR middle-end/36859 */
 /* { dg-do run } */
-/* { dg-options "-w" { target { ! ia32 } } } */
-/* { dg-options "-w" { target { llp64 } } } */
-/* { dg-options "-w -msse2 -mpreferred-stack-boundary=2" { target { ia32 } } } */
+/* { dg-options "-w -msse2" } */
+/* { dg-additional-options "-mpreferred-stack-boundary=2" { target { ia32 } } } */
 /* { dg-require-effective-target sse2 } */
 
 #include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/vect-cond-1.c b/gcc/testsuite/gcc.target/i386/vect-cond-1.c
index 7cea69154d4b..1bf7aa28a132 100644
--- a/gcc/testsuite/gcc.target/i386/vect-cond-1.c
+++ b/gcc/testsuite/gcc.target/i386/vect-cond-1.c
@@ -1,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-O2 -ftree-vectorize -mavx2" { target avx2 } } */
+/* { dg-options "-O2 -ftree-vectorize -mavx2" } */
 
 int a[1024];
 
diff --git a/gcc/testsuite/gcc.target/i386/vect8-ret.c b/gcc/testsuite/gcc.target/i386/vect8-ret.c
index 09283d72bef5..2b2b81ecf7ab 100644
--- a/gcc/testsuite/gcc.target/i386/vect8-ret.c
+++ b/gcc/testsuite/gcc.target/i386/vect8-ret.c
@@ -1,5 +1,4 @@ 
-/* { dg-do compile { target ia32 } } */
-/* { dg-options "-mmmx" { target *-*-vxworks* } } */
+/* { dg-do compile { target { ia32 && { ! *-*-vxworks* } } } } */
 /* { dg-options "-mmmx -mvect8-ret-in-mem" } */
 
 #include <mmintrin.h>