Similar to various previous such patches, this patch adds dg-skip-if
markers to various gcc.target/i386 tests to skip them if the multilib
options with which the testsuite is run contain -march= options
conflicting with those in the testcases (recall that multilib options
go *after* those from dg-options on the compiler command line).
Tested on x86_64-unknown-linux-gnu. OK to commit?
2011-09-21 Joseph Myers <jos...@codesourcery.com>
* gcc.target/i386/pad-2.c, gcc.target/i386/pad-3.c,
gcc.target/i386/pad-4.c, gcc.target/i386/pad-5a.c,
gcc.target/i386/pad-5b.c, gcc.target/i386/pad-6a.c,
gcc.target/i386/pad-6b.c, gcc.target/i386/pad-7.c,
gcc.target/i386/pad-8.c, gcc.target/i386/pad-9.c,
gcc.target/i386/pad-10.cm gcc.target/i386/vect-double-1.c: Skip if
multilib options contain different -march= from dg-options.
Index: gcc.target/i386/pad-9.c
===================================================================
--- gcc.target/i386/pad-9.c (revision 179049)
+++ gcc.target/i386/pad-9.c (working copy)
@@ -1,4 +1,5 @@
/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
/* { dg-final { scan-assembler-times "nop" 4 } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/pad-2.c
===================================================================
--- gcc.target/i386/pad-2.c (revision 179049)
+++ gcc.target/i386/pad-2.c (working copy)
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
/* { dg-final { scan-assembler-times "nop" 8 } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/pad-6a.c
===================================================================
--- gcc.target/i386/pad-6a.c (revision 179049)
+++ gcc.target/i386/pad-6a.c (working copy)
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ia32 } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
/* { dg-final { scan-assembler-times "nop" 4 } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/pad-10.c
===================================================================
--- gcc.target/i386/pad-10.c (revision 179049)
+++ gcc.target/i386/pad-10.c (working copy)
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
/* { dg-final { scan-assembler-not "nop" } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/pad-3.c
===================================================================
--- gcc.target/i386/pad-3.c (revision 179049)
+++ gcc.target/i386/pad-3.c (working copy)
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom -fno-pic" } */
/* { dg-final { scan-assembler-not "nop" } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/pad-5a.c
===================================================================
--- gcc.target/i386/pad-5a.c (revision 179049)
+++ gcc.target/i386/pad-5a.c (working copy)
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ia32 } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
/* { dg-final { scan-assembler-times "nop" 2 } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/pad-6b.c
===================================================================
--- gcc.target/i386/pad-6b.c (revision 179049)
+++ gcc.target/i386/pad-6b.c (working copy)
@@ -1,4 +1,5 @@
/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
/* { dg-final { scan-assembler-times "nop" 6 } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/pad-7.c
===================================================================
--- gcc.target/i386/pad-7.c (revision 179049)
+++ gcc.target/i386/pad-7.c (working copy)
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ia32 } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
/* { dg-final { scan-assembler-not "nop" } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/pad-4.c
===================================================================
--- gcc.target/i386/pad-4.c (revision 179049)
+++ gcc.target/i386/pad-4.c (working copy)
@@ -1,6 +1,7 @@
/* { dg-do compile } */
/* { dg-require-effective-target ia32 } */
/* { dg-require-effective-target fpic } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom -fPIC" } */
/* { dg-final { scan-assembler-times "nop" 8 } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/vect-double-1.c
===================================================================
--- gcc.target/i386/vect-double-1.c (revision 179049)
+++ gcc.target/i386/vect-double-1.c (working copy)
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=core2" } }
*/
/* { dg-options "-O2 -ftree-vectorize -mfpmath=sse -march=core2
-fdump-tree-vect-stats" } */
extern void abort (void);
Index: gcc.target/i386/pad-5b.c
===================================================================
--- gcc.target/i386/pad-5b.c (revision 179049)
+++ gcc.target/i386/pad-5b.c (working copy)
@@ -1,4 +1,5 @@
/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
/* { dg-final { scan-assembler-times "nop" 4 } } */
/* { dg-final { scan-assembler-not "rep" } } */
Index: gcc.target/i386/pad-8.c
===================================================================
--- gcc.target/i386/pad-8.c (revision 179049)
+++ gcc.target/i386/pad-8.c (working copy)
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=atom" } }
*/
/* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
/* { dg-final { scan-assembler-times "nop" 6 } } */
/* { dg-final { scan-assembler-not "rep" } } */
--
Joseph S. Myers
jos...@codesourcery.com
