* gcc.dg/mips-movcc-1.c, gcc.dg/mips-movcc-2.c, gcc.dg/mips-movcc-3.c,

	* gcc.dg/mips-nmadd-1.c, gcc.dg/mips-nmadd-2.c, gcc.dg/mips-rsqrt-1.c,
	* gcc.dg/mips-rsqrt-2, gcc.dg/mips-rsqrt-3.c: Add dummy asm statements
	to cope with cases where the multilib options override the dg-options.

From-SVN: r94331

8 files changed, 43 insertions, 2 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b3e25d6..dd20d3f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-27  Richard Sandiford  <rsandifo@redhat.com>
+
+	* gcc.dg/mips-movcc-1.c, gcc.dg/mips-movcc-2.c, gcc.dg/mips-movcc-3.c,
+	* gcc.dg/mips-nmadd-1.c, gcc.dg/mips-nmadd-2.c, gcc.dg/mips-rsqrt-1.c,
+	* gcc.dg/mips-rsqrt-2, gcc.dg/mips-rsqrt-3.c: Add dummy asm statements
+	to cope with cases where the multilib options override the dg-options.
+
 2005-01-27  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/18946
diff --git a/gcc/testsuite/gcc.dg/mips-movcc-1.c b/gcc/testsuite/gcc.dg/mips-movcc-1.c
index 1e05117..70a7dc7 100644
--- a/gcc/testsuite/gcc.dg/mips-movcc-1.c
+++ b/gcc/testsuite/gcc.dg/mips-movcc-1.c
@@ -6,6 +6,9 @@
 
 void ext_int (int);
 
+#if __mips < 4
+asm ("# movz movn");
+#else
 int
 sub1 (int i, int j, int k)
 {
@@ -17,9 +20,14 @@ sub2 (int i, int j, long l)
 {
   ext_int (!l ? i : j);
 }
+#endif
 
+#if __mips < 4 || __mips_soft_float
+asm ("# movt");
+#else
 int
 sub3 (int i, int j, float f)
 {
   ext_int (f ? i : j);
 }
+#endif
diff --git a/gcc/testsuite/gcc.dg/mips-movcc-2.c b/gcc/testsuite/gcc.dg/mips-movcc-2.c
index 954a7f1..22d58e9 100644
--- a/gcc/testsuite/gcc.dg/mips-movcc-2.c
+++ b/gcc/testsuite/gcc.dg/mips-movcc-2.c
@@ -6,6 +6,9 @@
 
 void ext_long (long);
 
+#if __mips < 4
+asm ("# movz movn");
+#else
 long
 sub4 (long i, long j, long k)
 {
@@ -17,9 +20,14 @@ sub5 (long i, long j, int k)
 {
   ext_long (!k ? i : j);
 }
+#endif
 
+#if __mips < 4 || __mips_soft_float
+asm ("# movf");
+#else
 long
 sub6 (long i, long j, float f)
 {
   ext_long (!f ? i : j);
 }
+#endif
diff --git a/gcc/testsuite/gcc.dg/mips-movcc-3.c b/gcc/testsuite/gcc.dg/mips-movcc-3.c
index 0bffe68..3a3a43b 100644
--- a/gcc/testsuite/gcc.dg/mips-movcc-3.c
+++ b/gcc/testsuite/gcc.dg/mips-movcc-3.c
@@ -7,6 +7,9 @@
 /* { dg-final { scan-assembler "movn.d" } } */
 /* { dg-final { scan-assembler "movf.d" } } */
 
+#if __mips < 4 || __mips_soft_float
+asm ("# movz.s movn.s movt.s movz.d movn.d movf.d");
+#else
 void ext_float (float);
 void ext_double (double);
 
@@ -45,3 +48,4 @@ subc (double f, double g, double h)
 {
   ext_double (!h ? f : g);
 }
+#endif
diff --git a/gcc/testsuite/gcc.dg/mips-nmadd-1.c b/gcc/testsuite/gcc.dg/mips-nmadd-1.c
index 1d84042..1bf7895 100644
--- a/gcc/testsuite/gcc.dg/mips-nmadd-1.c
+++ b/gcc/testsuite/gcc.dg/mips-nmadd-1.c
@@ -5,6 +5,9 @@
 /* { dg-final { scan-assembler "nmsub.s" } } */
 /* { dg-final { scan-assembler "nmsub.d" } } */
 
+#if (__mips != 4 && __mips != 64) || __mips_soft_float
+asm ("# nmadd.s nmadd.d nmsub.s nmsub.d");
+#else
 float
 sub1 (float f, float g, float h)
 {
@@ -28,3 +31,4 @@ sub4 (double f, double g, double h)
 {
   return -((f * g) - h);
 }
+#endif
diff --git a/gcc/testsuite/gcc.dg/mips-nmadd-2.c b/gcc/testsuite/gcc.dg/mips-nmadd-2.c
index a2af6ba..20b83bd 100644
--- a/gcc/testsuite/gcc.dg/mips-nmadd-2.c
+++ b/gcc/testsuite/gcc.dg/mips-nmadd-2.c
@@ -5,6 +5,9 @@
 /* { dg-final { scan-assembler "nmsub.s" } } */
 /* { dg-final { scan-assembler "nmsub.d" } } */
 
+#if (__mips != 4 && __mips != 64) || __mips_soft_float
+asm ("# nmadd.s nmadd.d nmsub.s nmsub.d");
+#else
 float
 sub1 (float f, float g, float h)
 {
@@ -28,3 +31,4 @@ sub4 (double f, double g, double h)
 {
   return -((f * g) - h);
 }
+#endif
diff --git a/gcc/testsuite/gcc.dg/mips-rsqrt-1.c b/gcc/testsuite/gcc.dg/mips-rsqrt-1.c
index 1f742b2..b228ddb 100644
--- a/gcc/testsuite/gcc.dg/mips-rsqrt-1.c
+++ b/gcc/testsuite/gcc.dg/mips-rsqrt-1.c
@@ -3,6 +3,9 @@
 /* { dg-final { scan-assembler "rsqrt.d" } } */
 /* { dg-final { scan-assembler "rsqrt.s" } } */
 
+#if (__mips != 4 && __mips != 64) || __mips_soft_float
+asm ("# rsqrt.d rsqrt.s");
+#else
 extern double sqrt(double);
 extern float sqrtf(float);
 
@@ -15,4 +18,4 @@ float bar(float x)
 {
   return 1.0f/sqrtf(x);
 }
-
+#endif
diff --git a/gcc/testsuite/gcc.dg/mips-rsqrt-2.c b/gcc/testsuite/gcc.dg/mips-rsqrt-2.c
index 5c014ab..a4cddcd 100644
--- a/gcc/testsuite/gcc.dg/mips-rsqrt-2.c
+++ b/gcc/testsuite/gcc.dg/mips-rsqrt-2.c
@@ -3,6 +3,9 @@
 /* { dg-final { scan-assembler "rsqrt.d" } } */
 /* { dg-final { scan-assembler "rsqrt.s" } } */
 
+#if (__mips != 4 && __mips != 64) || __mips_soft_float
+asm ("# rsqrt.d rsqrt.s");
+#else
 extern double sqrt(double);
 extern float sqrtf(float);
 
@@ -15,4 +18,4 @@ float bar(float x)
 {
   return sqrtf(1.0f/x);
 }
-
+#endif