aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMatthew Fortune <matthew.fortune@imgtec.com>2015-01-15 11:20:22 +0000
committerMatthew Fortune <mpf@gcc.gnu.org>2015-01-15 11:20:22 +0000
commit3387e6141e08d9cb010c88aea4017318fcbaf20a (patch)
tree47e399691753efe7cd50379a07a8480867ed769b /gcc
parent63ecaca0c0af13acd9ab25ec23ea18fc952c2c8b (diff)
downloadgcc-3387e6141e08d9cb010c88aea4017318fcbaf20a.zip
gcc-3387e6141e08d9cb010c88aea4017318fcbaf20a.tar.gz
gcc-3387e6141e08d9cb010c88aea4017318fcbaf20a.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/gcc.target/mips/mips.exp6
2 files changed, 12 insertions, 0 deletions
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