From 2ffc0382ff79b23a6f88113d277842934de258ed Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Tue, 29 Aug 2017 19:21:21 +0200 Subject: [PATCH] 20030926-1.c: Add dg-additional-options. * 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. From-SVN: r251417 --- gcc/testsuite/ChangeLog | 43 ++++++++++++++++++---- gcc/testsuite/gcc.target/i386/20030926-1.c | 2 +- gcc/testsuite/gcc.target/i386/abi-2.c | 2 +- gcc/testsuite/gcc.target/i386/asm-6.c | 4 +- gcc/testsuite/gcc.target/i386/bitfield1.c | 3 +- gcc/testsuite/gcc.target/i386/bitfield2.c | 3 +- gcc/testsuite/gcc.target/i386/bittest.c | 2 +- gcc/testsuite/gcc.target/i386/darwin-fpmath.c | 2 +- .../gcc.target/i386/interrupt-sibcall-2.c | 5 ++- gcc/testsuite/gcc.target/i386/mvc9.c | 4 +- gcc/testsuite/gcc.target/i386/pr22076.c | 2 +- gcc/testsuite/gcc.target/i386/pr37216.c | 2 +- gcc/testsuite/gcc.target/i386/pr39431.c | 2 +- gcc/testsuite/gcc.target/i386/pr40906-1.c | 4 +- gcc/testsuite/gcc.target/i386/pr40906-2.c | 4 +- gcc/testsuite/gcc.target/i386/pr43766.c | 2 +- gcc/testsuite/gcc.target/i386/pr44223.c | 4 +- gcc/testsuite/gcc.target/i386/pr45234.c | 4 +- gcc/testsuite/gcc.target/i386/pr46226.c | 4 +- gcc/testsuite/gcc.target/i386/pr46470.c | 5 ++- gcc/testsuite/gcc.target/i386/pr49866.c | 4 +- gcc/testsuite/gcc.target/i386/pr57091.c | 4 +- gcc/testsuite/gcc.target/i386/pr59929.c | 2 +- gcc/testsuite/gcc.target/i386/pr61599-2.c | 2 +- gcc/testsuite/gcc.target/i386/pr67480.c | 2 +- gcc/testsuite/gcc.target/i386/sse-10.c | 4 +- gcc/testsuite/gcc.target/i386/vararg-1.c | 5 +-- gcc/testsuite/gcc.target/i386/vararg-2.c | 5 +-- gcc/testsuite/gcc.target/i386/vect-cond-1.c | 2 +- gcc/testsuite/gcc.target/i386/vect8-ret.c | 3 +- 30 files changed, 81 insertions(+), 55 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 23fc398..1a4207c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,34 @@ +2017-08-29 Uros Bizjak + + * 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 PR tree-optimization/81503 @@ -5,12 +36,11 @@ 2017-08-29 Martin Liska - * 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 - Dominik Infuehr + Dominik Infuehr * gcc.dg/vect/costmodel/x86_64/costmodel-vect-slp.c: New testcase. @@ -129,8 +159,7 @@ 2017-08-24 Michael Meissner - * 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 - * 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 diff --git a/gcc/testsuite/gcc.target/i386/20030926-1.c b/gcc/testsuite/gcc.target/i386/20030926-1.c index ebde340..f4c8f61 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 39eafc2..72a17ec 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 6aa37ef..225e319 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 */ -/* { 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 714792c..ecc7efe 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 5784bf0..58f7cea 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 7b7ce9e..79c3897 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 693bdee..5b04701 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 f59253a..ae2df28 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 69e3cef..4052f2a 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 e9916c9..6c1620b 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 diff --git a/gcc/testsuite/gcc.target/i386/pr37216.c b/gcc/testsuite/gcc.target/i386/pr37216.c index 05eb2ee..e1942fe 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 0db7d56..a148dd3 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 233d8fd..1e78c23 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 58b076e..824c432 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 8ac1613..72898cc 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 3b8030c..9f134e7 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 3996fa2..d0579b5 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 168d80e..e93cbf3 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 c66a378..728ddcd 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 823305d..622c8f6 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 4fc7ed7..86cb5f0 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 4591dc4..53e0b23 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 f0d4602..be031c0 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 90e6a6e..aa54968 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 798551d..4d4de4f 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 3eda1e9..cab44ed 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 65599a5..3010f41 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 7cea691..1bf7aa2 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 09283d7..2b2b81e 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 -- 2.7.4