* gcc.dg/march-generic.c: Skip for -march in multilib options.

	* gcc.target/i386/isa-9.c: Skip for -march other than
	-march=amdfam10 in multilib options.
	* gcc.target/i386/pr42589.c: Skip for -march other than
	-march=i486 in multilib options.
	* gcc.target/i386/sse-19.c: Add -march=x86-64 option and skip for
	other -march in multilib options.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165882 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0d9dabd..21ddf30 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-23  Joseph Myers  <joseph@codesourcery.com>
+
+       * gcc.dg/march-generic.c: Skip for -march in multilib options.
+       * gcc.target/i386/isa-9.c: Skip for -march other than
+       -march=amdfam10 in multilib options.
+       * gcc.target/i386/pr42589.c: Skip for -march other than
+       -march=i486 in multilib options.
+       * gcc.target/i386/sse-19.c: Add -march=x86-64 option and skip for
+       other -march in multilib options.
+
 2010-10-23  Jie Zhang  <jie@codesourcery.com>
 
        PR rtl-optimization/37360

diff --git a/gcc/testsuite/gcc.dg/march-generic.c b/gcc/testsuite/gcc.dg/march-generic.c
index 2cebd36..7705a41 100644 (file)
--- a/gcc/testsuite/gcc.dg/march-generic.c
+++ b/gcc/testsuite/gcc.dg/march-generic.c
@@ -1,4 +1,5 @@
 /* { dg-do compile { target i?86-*-* } } */
+/* { dg-skip-if "" { *-*-* } { "-march=*" } { "" } } */
 /* { dg-options "-march=generic" } */
 /* { dg-error "generic CPU can be used only for -mtune" "" { target *-*-* } 0 } */
 /* { dg-bogus "march" "" { target *-*-* } 0 } */

diff --git a/gcc/testsuite/gcc.target/i386/isa-9.c b/gcc/testsuite/gcc.target/i386/isa-9.c
index 64cbdbd..b312be1 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/isa-9.c
+++ b/gcc/testsuite/gcc.target/i386/isa-9.c
@@ -1,4 +1,5 @@
 /* { dg-do run } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=amdfam10" } } */
 /* { dg-options "-march=amdfam10 -mno-fma4" } */
 
 extern void abort (void);

diff --git a/gcc/testsuite/gcc.target/i386/pr42589.c b/gcc/testsuite/gcc.target/i386/pr42589.c
index 04e419a..1366ef5 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr42589.c
+++ b/gcc/testsuite/gcc.target/i386/pr42589.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=i486" } } */
 /* { dg-options "-O2 -march=i486" } */
 
 void

diff --git a/gcc/testsuite/gcc.target/i386/sse-19.c b/gcc/testsuite/gcc.target/i386/sse-19.c
index 43c090b..7a49a98 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/sse-19.c
+++ b/gcc/testsuite/gcc.target/i386/sse-19.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -msse2" } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=x86-64" } } */
+/* { dg-options "-O3 -march=x86-64 -msse2" } */
 /* { dg-final { scan-assembler "punpcklbw" } } */
 extern void abort();
 #include <emmintrin.h>