Ensure options incompatible with micromips imply -mno-micromips

gcc/testsuite/

	* gcc.target/mips/mips.exp (mips-dg-options): -mips3d requires
	-mno-micromips.  MIPS32R1 and below require -mno-micromips.
	-march=loongson* and -march=octeon* require -mno-micromips.

From-SVN: r219641

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1285633cb34af1e297df79a3a0929a90ef64d455..842ebf445c05ffd02d975753348546922104d985 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-15  Matthew Fortune  <matthew.fortune@imgtec.com>
+
+       * gcc.target/mips/mips.exp (mips-dg-options): -mips3d requires
+       -mno-micromips.  MIPS32R1 and below require -mno-micromips.
+       -march=loongson* and -march=octeon* require -mno-micromips.
+
 2015-01-15  Andrew Bennett  <andrew.bennett@imgtec.com>
            Matthew Fortune  <matthew.fortune@imgtec.com>
 

diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp
index 3d6da815c49d10a3759f14a64b2c7e4d937ea39a..b81d344e42a6caa23c2e064776f5bf72ce8709b4 100644 (file)
--- a/gcc/testsuite/gcc.target/mips/mips.exp
+++ b/gcc/testsuite/gcc.target/mips/mips.exp
@@ -955,6 +955,7 @@ proc mips-dg-options { args } {
     mips_option_dependency options "-mips16" "-mno-micromips"
     mips_option_dependency options "-mmicromips" "-mno-mips16"
     mips_option_dependency options "-mips3d" "-mpaired-single"
+    mips_option_dependency options "-mips3d" "-mno-micromips"
     mips_option_dependency options "-mpaired-single" "-mfp64"
     mips_option_dependency options "-mfp64" "-mhard-float"
     mips_option_dependency options "-mfp32" "-mhard-float"
@@ -1298,6 +1299,7 @@ proc mips-dg-options { args } {
            }
            mips_make_test_option options "-mno-dsp"
            mips_make_test_option options "-mno-synci"
+           mips_make_test_option options "-mno-micromips"
        }
         if { $isa_rev > 5 } {
            mips_make_test_option options "-mno-dsp"
@@ -1310,6 +1312,10 @@ proc mips-dg-options { args } {
            mips_make_test_option options "-mnan=2008"
            mips_make_test_option options "-mabs=2008"
        }
+       if { [regexp {^-march=(octeon|loongson)} $arch] } {
+           mips_make_test_option options "-mno-micromips"
+       }
+
        unset arch
        unset isa
        unset isa_rev