diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 23fc3989a504a18c327882d1adac2bbfdd4f6d06..1a4207ceaeb06e2d80a1bac29fc379098a3ca087 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,34 @@
+2017-08-29 Uros Bizjak <ubizjak@gmail.com>
+
+ * gcc.target/i386/20030926-1.c: Add dg-additional-options.
+ * gcc.target/i386/abi-2.c: Ditto.
+ * gcc.target/i386/interrupt-sibcall-2.c: Ditto.
+ * gcc.target/i386/pr22076.c: Ditto.
+ * gcc.target/i386/pr37216.c: Ditto.
+ * gcc.target/i386/pr39431.c: Ditto.
+ * gcc.target/i386/pr40906-1.c: Ditto.
+ * gcc.target/i386/pr40906-2.c: Ditto.
+ * gcc.target/i386/pr43766.c: Ditto.
+ * gcc.target/i386/pr46226.c: Ditto.
+ * gcc.target/i386/pr46470.c: Ditto.
+ * gcc.target/i386/pr59929.c: Ditto.
+ * gcc.target/i386/sse-10.c: Ditto.
+ * gcc.target/i386/vararg-1.c: Ditto.
+ * gcc.target/i386/vararg-1.c: Ditto.
+ * gcc.target/i386/asm-6.c: Compile for fpic target only.
+ * gcc.target/i386/pr44223.c: Ditto.
+ * gcc.target/i386/bitfield1.c (dg-options): Remove target selector.
+ * gcc.target/i386/bitfield2.c (dg-options): Ditto.
+ * gcc.target/i386/pr67480.c (dg-options): Ditto.
+ * gcc.target/i386/vect-cond-1.c (dg-options): Ditto.
+ * gcc.target/i386/bittest.c (scan-assembler-times): Ditto.
+ * gcc.target/i386/darwin-fpmath.c (dg-do): Simplify target selector.
+ * gcc.target/i386/mvc9.c: Compile for lto target only.
+ * gcc.target/i386/pr45234.c: Compile for ia32 target only.
+ * gcc.target/i386/pr49866.c: Compile for lp64 target only.
+ * gcc.target/i386/pr57091.c: Ditto.
+ * gcc.target/i386/pr61599-2.c: Ditto.
+
2017-08-29 Bill Schmidt <wschmidt@linux.vnet.ibm.com>
PR tree-optimization/81503
@@ -5,12 +36,11 @@
2017-08-29 Martin Liska <mliska@suse.cz>
- * gcc.dg/tree-prof/update-loopch.c: Scan patterns in
- switchlower.
+ * gcc.dg/tree-prof/update-loopch.c: Scan patterns in switchlower.
* gcc.dg/tree-ssa/vrp104.c: Likewise.
2017-08-29 Richard Biener <rguenther@suse.de>
- Dominik Infuehr <dominik.infuehr@theobroma-systems.com>
+ Dominik Infuehr <dominik.infuehr@theobroma-systems.com>
* gcc.dg/vect/costmodel/x86_64/costmodel-vect-slp.c: New testcase.
@@ -129,8 +159,7 @@
2017-08-24 Michael Meissner <meissner@linux.vnet.ibm.com>
- * gcc.target/powerpc/dform-1.c: Delete -mpower9-dform*
- options.
+ * gcc.target/powerpc/dform-1.c: Delete -mpower9-dform* options.
* gcc.target/powerpc/dform-2.c: Likewise.
* gcc.target/powerpc/dform-3.c: Likewise.
* gcc.target/powerpc/pr71656-1.c: Likewise.
@@ -147,8 +176,8 @@
2017-08-24 Steven Munroe <munroesj@gcc.gnu.org>
- * gcc.target/powerpc/mmx-packuswb-1.c [NO_WARN_X86_INTRINSICS]:
- Define. Suppress warning during tests.
+ * gcc.target/powerpc/mmx-packuswb-1.c [NO_WARN_X86_INTRINSICS]: Define.
+ Suppress warning during tests.
2017-08-24 Uros Bizjak <ubizjak@gmail.com>
diff --git a/gcc/testsuite/gcc.target/i386/20030926-1.c b/gcc/testsuite/gcc.target/i386/20030926-1.c
index ebde340851137fb122bd93f04a4583cebd694eff..f4c8f618d4c3ae95f2e7af36a2a740274d454660 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 39eafc25039691237360869c596816f1c26acd84..72a17eca31fc5e450c4a7639bd9a615bc4e4c571 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 6aa37ef4276a97e184914947638c0f5732d77b1b..225e3193f7ad6866841d3a77b51628813e79c27e 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 714792c3d02699c1e1edb729b1cfefb1d21fbf71..ecc7efe6401078b2ac9f8e502735806089e88fc6 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 5784bf0ccb454915eec379717124a7232cdfe0a9..58f7cea1b603f96aba0f01636f83d6e21ce8c651 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 7b7ce9eed105f2ddc8621deed6c65cf2c3406029..79c389718591ac979a746cd0d7a874b24b773032 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 693bdee01f255ab0a432414ed3275330ce419f8b..5b047010bd1459cf81672aad64ad1f34c767dccd 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 f59253a5d5d6c7117ae25dd40e24c1630c862ef1..ae2df2870600c1c7da13d96918bee66c02b21bbd 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 69e3cefb7d1dfeb82f1573b6f486d03dbccba9ef..4052f2afb547f07067f7c15c38e37800dc24d918 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 e9916c9a5832df2effc5be70c107ce98a0004e23..6c1620b4a3b15a30d28368e68bf40f1e15a735ee 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 05eb2eea77f75fdaa19a58b2266c8bafb09ba038..e1942fe08958b28df740e19b7b1ff5a4c1154d21 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 0db7d5643036bcd79ad03b86dd5edab5c2ac2183..a148dd39ba5e734bfbfc36bb18a134502a3794b5 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 233d8fdcb0ec0bb4d7811f7b64d707119ca5e0b3..1e78c231d39d7f9a89b63fe7a62a4872f29d2dcf 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 58b076e1f5b2d8f0e62765ba4abd83e6a4fa2061..824c43254d37a82abfbcdb6518b7439a3060347c 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 8ac16137f78ba9ee9dc188e8078364a18a3b902e..72898ccc6501dfe99f6a1b8995cc078ed3ba7016 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 3b8030c1bbbef433c4bf0f92a455bb9cec2164c1..9f134e72348dd1456623d5c70b7618fbaa22d457 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 3996fa27fb6b41dd2f1cdd4f4db282aacf0ff9ee..d0579b5ea8dc3463ec38eb81863995cad0a55869 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 168d80e2be40b1447a4053cbd5a1c4ab7ecfb2a5..e93cbf3dda86446ab74a7c5c4051b3bf19d031d0 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 c66a378a1ad91ecf0465f5ca9931154e9dee93d9..728ddcde8ba7302788322dc0bbe90d6f97dca43c 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 823305df706cc627b0405a0c1d814521b4885143..622c8f656254b4ec993f4272383088e68208a076 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 4fc7ed769ba80f2ce32965836a0a8e109c74d12b..86cb5f02b610c2f53095b68fc5c0d54ff0dcb6fb 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 4591dc4d6016bbe9a4d4f8c921ec60d57b10b69c..53e0b237c2706133dd5403858b96162436d576ec 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 f0d46020dea153901958f04c946ccb9dcac91591..be031c05b1fa41c2f1caf9d96adffc62bc032b13 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 90e6a6e4b8ddb6c0f666851845b86f9cf1c1ab08..aa549682dbd869ba76dc20dae726bc9d04597899 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 798551db2aae8614f133a483873b5b8757f17410..4d4de4f4de55df18a927dc375a45e9f8c363c041 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 3eda1e93e251f97d10bb2ced296dc92dddaa8b96..cab44ed0969a413e33d3f632874f0c493fd73f9b 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 65599a57561ade5149ac37bda57ceff6831562cd..3010f415f828e4e58dae27df0280ed05d46854dd 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 7cea69154d4b2f56989def5c7d44e0dd7b6df461..1bf7aa28a132f42034ac9d961f60e1f68cf10730 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 09283d72bef5cfc7cc59952e6ae9205b6afec5a0..2b2b81ecf7aba0cbd8d821c6759b6f76673c5b88 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>