diff options
| author | Andrew Bennett <andrew.bennett@imgtec.com> | 2015-07-15 09:22:25 +0000 |
|---|---|---|
| committer | Andrew Bennett <abennett@gcc.gnu.org> | 2015-07-15 09:22:25 +0000 |
| commit | 765a514d7975a5a782c27336d65ec316a44d2a5d (patch) | |
| tree | 7ed3e2ac7b5f892d704fe76a0dc0bf759ba52fa9 /gcc | |
| parent | 6dba011330935d77386e99066fdb14b011a19ffa (diff) | |
| download | gcc-765a514d7975a5a782c27336d65ec316a44d2a5d.zip gcc-765a514d7975a5a782c27336d65ec316a44d2a5d.tar.gz gcc-765a514d7975a5a782c27336d65ec316a44d2a5d.tar.bz2 | |
MIPS: In mips.exp allow the post-arch code to be run when the pre-arch code increases the isa_rev to mips32r6 or greater.
testsuite/
* gcc.target/mips/mips.exp (mips-dg-options): Allow the post-arch
code to be run when the pre-arch code increases the isa_rev to
mips32r6 or greater.
From-SVN: r225813
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/mips/mips.exp | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b03eb9f..75a83ae 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-07-15 Andrew Bennett <andrew.bennett@imgtec.com> + + * gcc.target/mips/mips.exp (mips-dg-options): Allow the post-arch + code to be run when the pre-arch code increases the isa_rev to + mips32r6 or greater. + 2015-07-15 Richard Biener <rguenther@suse.de> * lib/c-torture.exp (C_TORTURE_OPTIONS): Remove diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp index 1dd4173..b3617e4 100644 --- a/gcc/testsuite/gcc.target/mips/mips.exp +++ b/gcc/testsuite/gcc.target/mips/mips.exp @@ -1045,6 +1045,7 @@ proc mips-dg-options { args } { set arch [mips_option options arch] set isa [mips_arch_info $arch isa] set isa_rev [mips_arch_info $arch isa_rev] + set orig_isa_rev $isa_rev # If the test forces a 32-bit architecture, force -mgp32. # Force the current -mgp setting otherwise; if we don't, @@ -1279,8 +1280,11 @@ proc mips-dg-options { args } { } # Handle dependencies between the arch option and the post-arch options. - # This should mirror the arch and pre-arch code above. - if { $arch_test_option_p } { + # This should mirror the arch and pre-arch code above. For pre-r6 + # architectures this only needs to be done when we've moved down + # to a lower architecture and might need to turn features off, + # but moving up from pre-r6 to r6 can remove features too. + if { $arch_test_option_p || ($orig_isa_rev < 6 && $isa_rev >= 6) } { if { $isa < 2 } { mips_make_test_option options "-mno-branch-likely" mips_make_test_option options "-mno-fix-r10000" |