From ea0b50bd4615607f3597176ed4f70523459e4f8e Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Sat, 6 Nov 2010 11:54:44 +0100
Subject: [PATCH] 387-2.c: Skip if -march= is specified.

	* gcc.target/i386/387-2.c: Skip if -march= is specified.
	* gcc.target/i386/387-6.c: Ditto.
	* gcc.target/i386/387-2.c: Add -mfancy-math-387 to dg-options.
	* gcc.target/i386/387-4.c: Ditto.
	* gcc.target/i386/387-7.c: Ditto.
	* gcc.target/i386/387-8.c: Ditto.
	* gcc.target/i386/387-9.c: Ditto.
	* gcc.target/i386/387-10.c: Ditto.
	* gcc.target/i386/387-11.c: Ditto.
	* gcc.target/i386/387-12.c: Ditto.

	* gcc.target/i386/387-2.c: Add -mno-sse3 to dg-options.

From-SVN: r166400
---
 gcc/testsuite/ChangeLog                    | 15 +++++++++++++++
 gcc/testsuite/gcc.target/i386/387-10.c     |  2 +-
 gcc/testsuite/gcc.target/i386/387-11.c     |  2 +-
 gcc/testsuite/gcc.target/i386/387-12.c     |  3 +--
 gcc/testsuite/gcc.target/i386/387-2.c      |  1 +
 gcc/testsuite/gcc.target/i386/387-3.c      |  3 +--
 gcc/testsuite/gcc.target/i386/387-4.c      |  3 +--
 gcc/testsuite/gcc.target/i386/387-6.c      |  1 +
 gcc/testsuite/gcc.target/i386/387-7.c      |  3 +--
 gcc/testsuite/gcc.target/i386/387-8.c      |  3 +--
 gcc/testsuite/gcc.target/i386/387-9.c      |  3 +--
 gcc/testsuite/gcc.target/i386/funcspec-8.c |  2 +-
 12 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4db13137877..a175424fcae 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-06  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/387-2.c: Skip if -march= is specified.
+	* gcc.target/i386/387-6.c: Ditto.
+	* gcc.target/i386/387-2.c: Add -mfancy-math-387 to dg-options.
+	* gcc.target/i386/387-4.c: Ditto.
+	* gcc.target/i386/387-7.c: Ditto.
+	* gcc.target/i386/387-8.c: Ditto.
+	* gcc.target/i386/387-9.c: Ditto.
+	* gcc.target/i386/387-10.c: Ditto.
+	* gcc.target/i386/387-11.c: Ditto.
+	* gcc.target/i386/387-12.c: Ditto.
+
+	* gcc.target/i386/387-2.c: Add -mno-sse3 to dg-options.
+
 2010-11-06  Iain Sandoe  <iains@gcc.gnu.org>
 
 	PR target/44981
diff --git a/gcc/testsuite/gcc.target/i386/387-10.c b/gcc/testsuite/gcc.target/i386/387-10.c
index 565f0196e88..0ff1b2a7c7c 100644
--- a/gcc/testsuite/gcc.target/i386/387-10.c
+++ b/gcc/testsuite/gcc.target/i386/387-10.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/24964 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -mfpmath=387" } */
+/* { dg-options "-O2 -mfpmath=387 -mfancy-math-387" } */
 
 double fabs(double x);
 
diff --git a/gcc/testsuite/gcc.target/i386/387-11.c b/gcc/testsuite/gcc.target/i386/387-11.c
index 03020f64fde..869f6061c38 100644
--- a/gcc/testsuite/gcc.target/i386/387-11.c
+++ b/gcc/testsuite/gcc.target/i386/387-11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mfpmath=387" } */
+/* { dg-options "-O2 -mfpmath=387 -mfancy-math-387" } */
 
 double foo(double x, double y)
 {
diff --git a/gcc/testsuite/gcc.target/i386/387-12.c b/gcc/testsuite/gcc.target/i386/387-12.c
index 6b3ce240540..62c1d483c27 100644
--- a/gcc/testsuite/gcc.target/i386/387-12.c
+++ b/gcc/testsuite/gcc.target/i386/387-12.c
@@ -1,7 +1,6 @@
 /* PR target/26915 */
 /* { dg-do compile } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-options "-O" } */
+/* { dg-options "-O -mfpmath=387 -mfancy-math-387" } */
 
 double testm0(void)
 {
diff --git a/gcc/testsuite/gcc.target/i386/387-2.c b/gcc/testsuite/gcc.target/i386/387-2.c
index 5a317efea57..bd6dbcdda99 100644
--- a/gcc/testsuite/gcc.target/i386/387-2.c
+++ b/gcc/testsuite/gcc.target/i386/387-2.c
@@ -1,6 +1,7 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
 /* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=i686" } } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fsin" } } */
 /* { dg-final { scan-assembler "fcos" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-3.c b/gcc/testsuite/gcc.target/i386/387-3.c
index ce11faa8f86..d00c7296721 100644
--- a/gcc/testsuite/gcc.target/i386/387-3.c
+++ b/gcc/testsuite/gcc.target/i386/387-3.c
@@ -1,7 +1,6 @@
 /* Verify that 387 mathematical constants are recognized.  */
 /* { dg-do compile } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-options "-O2 -march=i686" } */
+/* { dg-options "-O2 -mfpmath=387 -mfancy-math-387" } */
 /* { dg-final { scan-assembler "fldpi" } } */
 
 long double add_pi(long double x)
diff --git a/gcc/testsuite/gcc.target/i386/387-4.c b/gcc/testsuite/gcc.target/i386/387-4.c
index 5617636da56..e4f4a48f2ef 100644
--- a/gcc/testsuite/gcc.target/i386/387-4.c
+++ b/gcc/testsuite/gcc.target/i386/387-4.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-options "-O2 -march=i686" } */
+/* { dg-options "-O2 -mfancy-math-387" } */
 /* { dg-final { scan-assembler "fldpi" } } */
 
 long double atanl (long double);
diff --git a/gcc/testsuite/gcc.target/i386/387-6.c b/gcc/testsuite/gcc.target/i386/387-6.c
index bfef46ae5f5..7b254d1302f 100644
--- a/gcc/testsuite/gcc.target/i386/387-6.c
+++ b/gcc/testsuite/gcc.target/i386/387-6.c
@@ -1,6 +1,7 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
 /* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
+/* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=i686" } } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fpatan" } } */
 /* { dg-final { scan-assembler "fyl2xp1" } } */
diff --git a/gcc/testsuite/gcc.target/i386/387-7.c b/gcc/testsuite/gcc.target/i386/387-7.c
index 61c82c95eed..e01ed2e0576 100644
--- a/gcc/testsuite/gcc.target/i386/387-7.c
+++ b/gcc/testsuite/gcc.target/i386/387-7.c
@@ -1,7 +1,6 @@
 /* Verify that 387 fsincos instruction is generated.  */
 /* { dg-do compile } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-options "-O -ffast-math -march=i686" } */
+/* { dg-options "-O -ffast-math -mfpmath=387 -mfancy-math-387" } */
 /* { dg-final { scan-assembler "fsincos" } } */
 
 extern double sin (double);
diff --git a/gcc/testsuite/gcc.target/i386/387-8.c b/gcc/testsuite/gcc.target/i386/387-8.c
index 3293f560c25..2dbcd740f62 100644
--- a/gcc/testsuite/gcc.target/i386/387-8.c
+++ b/gcc/testsuite/gcc.target/i386/387-8.c
@@ -2,8 +2,7 @@
    inherent load of 1.0 is used in further calculations.  */
 
 /* { dg-do compile } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-options "-O2 -ffast-math -march=i686" } */
+/* { dg-options "-O2 -ffast-math -mfpmath=387 -mfancy-math-387" } */
 /* { dg-final { scan-assembler "fptan" } } */
 /* { dg-final { scan-assembler-not "fld1" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/387-9.c b/gcc/testsuite/gcc.target/i386/387-9.c
index 9d126aff8dd..2667aa46872 100644
--- a/gcc/testsuite/gcc.target/i386/387-9.c
+++ b/gcc/testsuite/gcc.target/i386/387-9.c
@@ -1,7 +1,6 @@
 /* Verify that 387 fsincos instruction is generated.  */
 /* { dg-do compile } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-options "-O -funsafe-math-optimizations -march=i686" } */
+/* { dg-options "-O -funsafe-math-optimizations -mfpmath=387 -mfancy-math-387" } */
 
 extern double sin (double);
 extern double cos (double);
diff --git a/gcc/testsuite/gcc.target/i386/funcspec-8.c b/gcc/testsuite/gcc.target/i386/funcspec-8.c
index ba4b7f22743..225843493d9 100644
--- a/gcc/testsuite/gcc.target/i386/funcspec-8.c
+++ b/gcc/testsuite/gcc.target/i386/funcspec-8.c
@@ -2,7 +2,7 @@
    functions in functions with the appropriate function specific options.  */
 /* { dg-do compile } */
 /* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=k8" } } */
-/* { dg-options "-O2 -march=k8 -mfpmath=sse" } */
+/* { dg-options "-O2 -march=k8 -mno-sse3 -mfpmath=sse" } */
 
 typedef float     __m128  __attribute__ ((__vector_size__ (16), __may_alias__));
 typedef double    __m128d __attribute__ ((__vector_size__ (16), __may_alias__));