MIPS/GAS/testsuite: Correct NewABI test selection

Make sure all tests that require NewABI support are only run with
`has_newabi' targets, removing numerous `mips-sgi-irix5' failures.

	gas/
	* testsuite/gas/mips/mips.exp: Limit remaining tests that
	require NewABI support to `has_newabi' targets.

2 files changed, 84 insertions, 27 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f7d36b5..571c776 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-20  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* testsuite/gas/mips/mips.exp: Limit remaining tests that
+	require NewABI support to `has_newabi' targets.
+
 2015-12-20  Andrew Waterman  <andrew@sifive.com>
 
 	* config/tc-riscv.c (riscv_pseudo_table): Remove "align",
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index d3809e7..a51c2a7 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -662,7 +662,7 @@ if { [istarget mips*-*-vxworks*] } {
 
     run_dump_test "div"
 
-    if { !$addr32 } {
+    if { !$addr32 && $has_newabi } {
 	run_dump_test_arches "dli"	[mips_arch_list_matching mips3]
     }
     run_dump_test_arches "jal"		[mips_arch_list_matching mips1]
@@ -673,9 +673,11 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "eret-1"
     run_dump_test "eret-2"
     run_dump_test "eret-3"
-    run_dump_test_arches "fix-rm7000-1" \
+    if { $has_newabi } {
+	run_dump_test_arches "fix-rm7000-1" \
 					[mips_arch_list_matching mips3 !singlefloat \
 						!mips64r6]
+    }
     run_dump_test_arches "fix-rm7000-2" \
 					[mips_arch_list_matching mips3 !singlefloat \
 						!mips64r6]
@@ -847,7 +849,9 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test_arches "uld2-el" [mips_arch_list_matching mips3 !mips32r6]
 
     run_dump_test "mips16"
-    run_dump_test "mips16-64"
+    if { $has_newabi } {
+	run_dump_test "mips16-64"
+    }
     run_dump_test "mips16-macro"
     # Check MIPS16e extensions
     run_dump_test_arches "mips16e" [mips_arch_list_matching mips32 !micromips \
@@ -947,7 +951,9 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "sync"
 
     run_dump_test_arches "virt"		[mips_arch_list_matching mips32r2]
-    run_dump_test_arches "virt64"	[mips_arch_list_matching mips64r2]
+    if { $has_newabi } {
+	run_dump_test_arches "virt64"	[mips_arch_list_matching mips64r2]
+    }
 
     run_dump_test_arches "mips32"	[mips_arch_list_matching mips32]
     run_dump_test_arches "mips32-imm"	[mips_arch_list_matching mips32]
@@ -983,11 +989,16 @@ if { [istarget mips*-*-vxworks*] } {
 
     if { !$addr32 } {
 	run_dump_test "mips64-mips3d"
-	run_dump_test_arches "mips64-mips3d-incl" [mips_arch_list_matching mips3d]
+	if { $has_newabi } {
+	    run_dump_test_arches "mips64-mips3d-incl" \
+					[mips_arch_list_matching mips3d]
+	}
 
 	run_dump_test "mips64-mdmx"
-	run_dump_test "sb1-ext-mdmx"
-	run_dump_test "sb1-ext-ps"
+	if { $has_newabi } {
+	    run_dump_test "sb1-ext-mdmx"
+	    run_dump_test "sb1-ext-ps"
+	}
 	run_dump_test "xlr-ext"
     }
 
@@ -1267,10 +1278,15 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "loongson-3a-2"
     run_dump_test "loongson-3a-3"
 
-    run_dump_test_arches "octeon"	[mips_arch_list_matching octeon]
+    if { $has_newabi } {
+	run_dump_test_arches "octeon"	[mips_arch_list_matching octeon]
+    }
     run_dump_test_arches "octeon-saa-saad" [mips_arch_list_matching octeonp]
     run_list_test_arches "octeon-ill"	[mips_arch_list_matching octeon]
-    run_dump_test_arches "octeon-pref"	[mips_arch_list_matching octeon]
+    if { $has_newabi } {
+	run_dump_test_arches "octeon-pref" \
+					[mips_arch_list_matching octeon]
+    }
     run_dump_test_arches "octeon2"	[mips_arch_list_matching octeon2]
     run_dump_test_arches "octeon3"	[mips_arch_list_matching octeon3]
 
@@ -1423,7 +1439,9 @@ if { [istarget mips*-*-vxworks*] } {
     run_list_test "bltzal"
 
     run_dump_test_arches "msa"		[mips_arch_list_matching mips32r2]
-    run_dump_test_arches "msa64"	[mips_arch_list_matching mips64r2]
+    if { $has_newabi } {
+	run_dump_test_arches "msa64"	[mips_arch_list_matching mips64r2]
+    }
     run_dump_test_arches "msa-relax"	[mips_arch_list_matching mips32r2 !mips32r6]
     run_dump_test_arches "msa-branch"	[mips_arch_list_matching mips32r2]
 
@@ -1493,8 +1511,10 @@ if { [istarget mips*-*-vxworks*] } {
 
     run_dump_test_arches "attr-gnu-4-0" "-32" \
 				    [mips_arch_list_matching mips1]
-    run_dump_test_arches "attr-gnu-4-0" "-64" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-gnu-4-0" "-64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_dump_test_arches "attr-gnu-4-0" "-mfp32 -32" \
 				    [mips_arch_list_matching mips1 !mips32r6]
     run_dump_test_arches "attr-gnu-4-0" "-mfpxx -32" \
@@ -1503,22 +1523,30 @@ if { [istarget mips*-*-vxworks*] } {
 				    [mips_arch_list_matching mips32r2]
     run_dump_test_arches "attr-gnu-4-0" "-mfp64 -mno-odd-spreg -32" \
 				    [mips_arch_list_matching mips32r2]
-    run_dump_test_arches "attr-gnu-4-0" "-mfp64 -64" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-gnu-4-0" "-mfp64 -64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_dump_test_arches "attr-gnu-4-0" "-msingle-float -32" \
 				    [mips_arch_list_matching mips1]
-    run_dump_test_arches "attr-gnu-4-0" "-msingle-float -64" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-gnu-4-0" "-msingle-float -64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_dump_test_arches "attr-gnu-4-0" "-msoft-float -32" \
 				    [mips_arch_list_matching mips1]
-    run_dump_test_arches "attr-gnu-4-0" "-msoft-float -64" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-gnu-4-0" "-msoft-float -64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_dump_test_arches "attr-none-double" "-32" \
 				    [mips_arch_list_matching mips1 !mips32r6]
     run_dump_test_arches "r6-attr-none-double" "-32" \
 				    [mips_arch_list_matching mips32r6]
-    run_dump_test_arches "attr-none-double" "-64" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-none-double" "-64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_dump_test_arches "attr-none-o32-fpxx" \
 				    [mips_arch_list_matching mips2 !r5900]
     run_dump_test_arches "attr-none-o32-fp64" \
@@ -1527,20 +1555,26 @@ if { [istarget mips*-*-vxworks*] } {
 				    [mips_arch_list_matching mips32r2]
     run_dump_test_arches "attr-none-single-float" "-32" \
 				    [mips_arch_list_matching mips1]
-    run_dump_test_arches "attr-none-single-float" "-64" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-none-single-float" "-64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_dump_test_arches "attr-none-soft-float" "-32 -msoft-float" \
 				    [mips_arch_list_matching mips1]
-    run_dump_test_arches "attr-none-soft-float" "-64 -msoft-float" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-none-soft-float" "-64 -msoft-float" \
 				    [mips_arch_list_matching mips3]
+    }
 
     run_list_test_arches "attr-gnu-4-1-mfp64" \
 				    "-32 -mfp64 -mno-odd-spreg" \
 				    [mips_arch_list_matching mips32r2]
     run_list_test_arches "attr-gnu-4-1-mfp64" "-32 -mfp64" \
 				    [mips_arch_list_matching mips32r2]
-    run_list_test_arches "attr-gnu-4-1-mfp32" "-64 -mfp32" \
+    if { $has_newabi } {
+	run_list_test_arches "attr-gnu-4-1-mfp32" "-64 -mfp32" \
 				    [mips_arch_list_matching mips3 !mips64r6]
+    }
     run_list_test_arches "attr-gnu-4-1-msingle-float" "-32 -msingle-float" \
 				    [mips_arch_list_matching mips1]
     run_list_test_arches "attr-gnu-4-1-msoft-float" "-32 -msoft-float" \
@@ -1549,8 +1583,10 @@ if { [istarget mips*-*-vxworks*] } {
 				    [mips_arch_list_matching mips2 !r5900]
     run_dump_test_arches "attr-gnu-4-1" "-32 -mfp32" \
 				    [mips_arch_list_matching mips1 !mips32r6]
-    run_dump_test_arches "attr-gnu-4-1" "-64 -mfp64" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-gnu-4-1" "-64 -mfp64" \
 				    [mips_arch_list_matching mips3]
+    }
 
     run_list_test_arches "attr-gnu-4-2-mdouble-float" "-32 -mfp32" \
 				    [mips_arch_list_matching mips1 !mips32r6]
@@ -1561,14 +1597,18 @@ if { [istarget mips*-*-vxworks*] } {
     run_list_test_arches "attr-gnu-4-2-mdouble-float" \
 				    "-32 -mfp64 -mno-odd-spreg" \
 				    [mips_arch_list_matching mips32r2]
-    run_list_test_arches "attr-gnu-4-2-mdouble-float" "-64 -mfp64" \
+    if { $has_newabi } {
+	run_list_test_arches "attr-gnu-4-2-mdouble-float" "-64 -mfp64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_list_test_arches "attr-gnu-4-2-msoft-float" "-32 -msoft-float" \
 				    [mips_arch_list_matching mips1]
     run_dump_test_arches "attr-gnu-4-2" "-32" \
 				    [mips_arch_list_matching mips1]
-    run_dump_test_arches "attr-gnu-4-2" "-64" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-gnu-4-2" "-64" \
 				    [mips_arch_list_matching mips3]
+    }
 
     run_list_test_arches "attr-gnu-4-3-mhard-float" "-32 -mfp32" \
 				    [mips_arch_list_matching mips1 !mips32r6]
@@ -1579,14 +1619,18 @@ if { [istarget mips*-*-vxworks*] } {
     run_list_test_arches "attr-gnu-4-3-mhard-float" \
 				    "-32 -mfp64 -mno-odd-spreg" \
 				    [mips_arch_list_matching mips32r2]
-    run_list_test_arches "attr-gnu-4-3-mhard-float" "-64 -mfp64" \
+    if { $has_newabi } {
+	run_list_test_arches "attr-gnu-4-3-mhard-float" "-64 -mfp64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_list_test_arches "attr-gnu-4-3-mhard-float" "-32 -msingle-float" \
 				    [mips_arch_list_matching mips1]
     run_dump_test_arches "attr-gnu-4-3" "-32" \
 				    [mips_arch_list_matching mips1]
-    run_dump_test_arches "attr-gnu-4-3" "-64" \
+    if { $has_newabi } {
+	run_dump_test_arches "attr-gnu-4-3" "-64" \
 				    [mips_arch_list_matching mips3]
+    }
  
     run_list_test_arches "attr-gnu-4-4" "-32 -mfp32" \
 				    [mips_arch_list_matching mips1 !mips32r6]
@@ -1596,8 +1640,10 @@ if { [istarget mips*-*-vxworks*] } {
 				    [mips_arch_list_matching mips32r2]
     run_list_test_arches "attr-gnu-4-4" "-32 -mfp64 -mno-odd-spreg" \
 				    [mips_arch_list_matching mips32r2]
-    run_list_test_arches "attr-gnu-4-4" "-64 -mfp64" \
+    if { $has_newabi } {
+	run_list_test_arches "attr-gnu-4-4" "-64 -mfp64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_list_test_arches "attr-gnu-4-4" "-32 -msingle-float" \
 				    [mips_arch_list_matching mips1]
     run_list_test_arches "attr-gnu-4-4" "-32 -msoft-float" \
@@ -1609,8 +1655,10 @@ if { [istarget mips*-*-vxworks*] } {
 				    [mips_arch_list_matching mips32r2]
     run_list_test_arches "attr-gnu-4-5" "-32 -mfp64 -mno-odd-spreg" \
 				    [mips_arch_list_matching mips32r2]
-    run_list_test_arches "attr-gnu-4-5-64" "-64 -mfp64" \
+    if { $has_newabi } {
+	run_list_test_arches "attr-gnu-4-5-64" "-64 -mfp64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_list_test_arches "attr-gnu-4-5-msingle-float" "-32 -msingle-float" \
 				    [mips_arch_list_matching mips1]
     run_list_test_arches "attr-gnu-4-5-msoft-float" "-32 -msoft-float" \
@@ -1622,8 +1670,10 @@ if { [istarget mips*-*-vxworks*] } {
 				    [mips_arch_list_matching mips1 !mips32r6]
     run_list_test_arches "attr-gnu-4-6-noodd" "-32 -mfp64 -mno-odd-spreg" \
 				    [mips_arch_list_matching mips32r2]
-    run_list_test_arches "attr-gnu-4-6-64" "-64 -mfp64" \
+    if { $has_newabi } {
+	run_list_test_arches "attr-gnu-4-6-64" "-64 -mfp64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_list_test_arches "attr-gnu-4-6-msingle-float" "-32 -msingle-float" \
 				    [mips_arch_list_matching mips1]
     run_list_test_arches "attr-gnu-4-6-msoft-float" "-32 -msoft-float" \
@@ -1637,8 +1687,10 @@ if { [istarget mips*-*-vxworks*] } {
 				    [mips_arch_list_matching mips1 !mips32r6]
     run_list_test_arches "attr-gnu-4-7-odd" "-32 -mfp64" \
 				    [mips_arch_list_matching mips32r2]
-    run_list_test_arches "attr-gnu-4-7-64" "-64 -mfp64" \
+    if { $has_newabi } {
+	run_list_test_arches "attr-gnu-4-7-64" "-64 -mfp64" \
 				    [mips_arch_list_matching mips3]
+    }
     run_list_test_arches "attr-gnu-4-7-msingle-float" "-32 -msingle-float" \
 				    [mips_arch_list_matching mips1]
     run_list_test_arches "attr-gnu-4-7-msoft-float" "-32 -msoft-float" \