mips.exp: Redefine isa variable which is referenced in later code.

gcc/testsuite/
	* gcc.target/mips/mips.exp (mips-dg-options): Redefine isa
	which is used in later code.

From-SVN: r226957

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2f1ba2532a1058980725a726ef017fb0b3eaf6f6..0df0c54094fd66d2143f542925a3c4e683f644c2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-17  Matthew Fortune  <matthew.fortune@imgtec.com>
+
+       * gcc.target/mips/mips.exp (mips-dg-options): Redefine isa
+       which is used in later code.
+
 2015-08-17  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/67216

diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp
index b3617e44269b9f2c58493d543936b17939ad6fb0..55e4223d7fddeddddf622ac80d3046212c7084e7 100644 (file)
--- a/gcc/testsuite/gcc.target/mips/mips.exp
+++ b/gcc/testsuite/gcc.target/mips/mips.exp
@@ -1190,6 +1190,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