[PATCH,committed] Ensure options incompatible with micromips imply -mno-micromips

[Matthew Fortune]

A bit of housekeeping in mips.exp. Several test options are incompatible
with micromips so this patch enforces no-micromips as required.

The number of failures in mips.exp for -mmicromips is now much lower and
primarily related to branch distance differences vs MIPS.

Thanks,
Matthew

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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219641 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                | 6 ++++++
 gcc/testsuite/gcc.target/mips/mips.exp | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1285633..842ebf4 100644
--- 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 3d6da81..b81d344 100644
--- 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
-- 
2.2.1