Update MIPS tests for test failures on some configurations.

	* gas/mips/micromips32-move.d: Update expected disassembly.
	* gas/mips/move.d: Likewise.
	* gas/mips/move.s: Fix for some MIPS configurations.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 4d4dcbc..f6f8b37 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -7,6 +7,12 @@
        register.
        * gas/sparc/rdpr.d: ...and the expected result.
 
+2015-08-25  Simon Dardis  <Simon.Dardis@imgtec.com>
+
+       * gas/mips/micromips32-move.d: Update expected disassembly.
+       * gas/mips/move.d: Likewise.
+       * gas/mips/move.s: Fix for some MIPS configurations.
+
 2015-08-24  Jan Stancek  <jstancek@redhat.com>
 
        * gas/i386/intel.s: Add test of disassembly of a potential

diff --git a/gas/testsuite/gas/mips/micromips32-move.d b/gas/testsuite/gas/mips/micromips32-move.d
index 1a30f06..b13d927 100644 (file)
--- a/gas/testsuite/gas/mips/micromips32-move.d
+++ b/gas/testsuite/gas/mips/micromips32-move.d
@@ -1,4 +1,4 @@
-#objdump: -dr -m mips:micromips
+#objdump: -dr -m mips:micromips -M reg-names=numeric
 #name: microMIPS insn32 move test
 #source: micromips32-move.s
 
@@ -8,7 +8,7 @@
 
 Disassembly of section .text:
 0+ <.*>:
-   0:  001f 6a90       move    t5,ra
-   4:  001f 6950       move    t5,ra
-   8:  581f 6950       move    t5,ra
-   c:  001f 6a90       move    t5,ra
+   0:  001f 6a90       move    \$13,\$31
+   4:  001f 6950       move    \$13,\$31
+   8:  581f 6950       move    \$13,\$31
+   c:  001f 6a90       move    \$13,\$31

diff --git a/gas/testsuite/gas/mips/move.d b/gas/testsuite/gas/mips/move.d
index aa978ea..28a9673 100644 (file)
--- a/gas/testsuite/gas/mips/move.d
+++ b/gas/testsuite/gas/mips/move.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr -M reg-names=numeric
 #name: MIPS move disassembly test
 #source: move.s
 
@@ -8,7 +8,7 @@
 
 Disassembly of section .text:
 0+ <.*>:
-   0:  03e06825        move    t5,ra
-   4:  03e06821        move    t5,ra
-   8:  03e0682d        move    t5,ra
-   c:  03e06825        move    t5,ra
+   0:  03e08025        move    \$16,\$31
+   4:  03e08021        move    \$16,\$31
+   8:  03e0802d        move    \$16,\$31
+   c:  03e08025        move    \$16,\$31

diff --git a/gas/testsuite/gas/mips/move.s b/gas/testsuite/gas/mips/move.s
index 912577b..6be2d3d 100644 (file)
--- a/gas/testsuite/gas/mips/move.s
+++ b/gas/testsuite/gas/mips/move.s
@@ -1,4 +1,4 @@
-       move    $13, $31
-       addu    $13, $31, $0
-       daddu   $13, $31, $0
-       or      $13, $31, $0
+       move    $16, $31
+       addu    $16, $31, $0
+       daddu   $16, $31, $0
+       or      $16, $31, $0