When switching up from an older ISA to MIPSR6 some features need to be
disabled. The support for this added in rev r225813 missed the fact
that both the $isa and $isa_rev variables are referenced in this code
so both must get redefined to their (potentially) new values. Without
this patch a number of tests will be reported as unsupported as it is
a TCL error not a test error.

Committed.

Thanks,
Matthew

gcc/testsuite/
        * gcc.target/mips/mips.exp (mips-dg-options): Redefine isa
        which is used in later code.
---
 gcc/testsuite/gcc.target/mips/mips.exp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gcc/testsuite/gcc.target/mips/mips.exp 
b/gcc/testsuite/gcc.target/mips/mips.exp
index 1ac22a5..42e7fff 100644
--- a/gcc/testsuite/gcc.target/mips/mips.exp
+++ b/gcc/testsuite/gcc.target/mips/mips.exp
@@ -1196,6 +1196,7 @@ proc mips-dg-options { args } {
 
     # Re-calculate the isa_rev for use in the abi handling code below
     set arch [mips_option options arch]
+    set isa [mips_arch_info $arch isa]
     set isa_rev [mips_arch_info $arch isa_rev]
 
     # Set an appropriate ABI, handling dependencies between the pre-abi
-- 
2.2.1

Reply via email to