* gas/mips/eret-1.s: Add trailing padding.

	* gas/mips/eret-2.s: Likewise.
	* gas/mips/eret-3.s: Likewise.
	* gas/mips/eret-1.d: Adjust accordingly.  Force a 32-bit ABI.
	* gas/mips/eret-2.d: Likewise.
	* gas/mips/eret-3.d: Likewise.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5b40037..0b68cb6 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,14 @@
 2009-09-21  Maciej W. Rozycki  <macro@linux-mips.org>
 
+       * gas/mips/eret-1.s: Add trailing padding.
+       * gas/mips/eret-2.s: Likewise.
+       * gas/mips/eret-3.s: Likewise.
+       * gas/mips/eret-1.d: Adjust accordingly.  Force a 32-bit ABI.
+       * gas/mips/eret-2.d: Likewise.
+       * gas/mips/eret-3.d: Likewise.
+
+2009-09-21  Maciej W. Rozycki  <macro@linux-mips.org>
+
        * gas/mips/mips.exp: Fix a typo.
 
 2009-09-21  Ben Elliston  <bje@au.ibm.com>

diff --git a/gas/testsuite/gas/mips/eret-1.d b/gas/testsuite/gas/mips/eret-1.d
index 1171d2d..4c4e6d3 100644 (file)
--- a/gas/testsuite/gas/mips/eret-1.d
+++ b/gas/testsuite/gas/mips/eret-1.d
@@ -1,6 +1,6 @@
 #objdump: -d
 #name: MIPS eret-1 disassembly
-#as: -mfix-24k -march=24kc --no-warn
+#as: -mabi=32 -mfix-24k -march=24kc --no-warn
 
 .*\.o:     file format .*mips.*
 
@@ -39,3 +39,4 @@ Disassembly of section \.text:
   74:  240c0003        li      t4,3
   78:  240c0003        li      t4,3
   7c:  42000018        eret
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/eret-1.s b/gas/testsuite/gas/mips/eret-1.s
index 081d01e..088acba 100644 (file)
--- a/gas/testsuite/gas/mips/eret-1.s
+++ b/gas/testsuite/gas/mips/eret-1.s
@@ -25,3 +25,6 @@
        li $t4, 3
 1:     li $t4, 3
        eret
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+        .space 8

diff --git a/gas/testsuite/gas/mips/eret-2.d b/gas/testsuite/gas/mips/eret-2.d
index 3b8e4af..a78940f 100644 (file)
--- a/gas/testsuite/gas/mips/eret-2.d
+++ b/gas/testsuite/gas/mips/eret-2.d
@@ -1,6 +1,6 @@
 #objdump: -d
 #name: MIPS eret-2 disassembly
-#as: -mfix-24k -march=24kc --no-warn
+#as: -mabi=32 -mfix-24k -march=24kc --no-warn
 
 .*\.o:     file format .*mips.*
 
@@ -14,3 +14,5 @@ Disassembly of section \.text:
   10:  42000018        eret
   14:  00000000        nop
   18:  1000fffd        b       0x10
+  1c:  00000000        nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/eret-2.s b/gas/testsuite/gas/mips/eret-2.s
index 4c15f21..dfe1e60 100644 (file)
--- a/gas/testsuite/gas/mips/eret-2.s
+++ b/gas/testsuite/gas/mips/eret-2.s
@@ -7,3 +7,6 @@
        .set    noreorder
        b       1b
        .set    reorder
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+        .space 8

diff --git a/gas/testsuite/gas/mips/eret-3.d b/gas/testsuite/gas/mips/eret-3.d
index 9834699..f31afa6 100644 (file)
--- a/gas/testsuite/gas/mips/eret-3.d
+++ b/gas/testsuite/gas/mips/eret-3.d
@@ -1,6 +1,6 @@
 #objdump: -d
 #name: MIPS eret-3 disassembly
-#as: -mfix-24k -march=24kc --no-warn
+#as: -mabi=32 -mfix-24k -march=24kc --no-warn
 
 .*\.o:     file format .*mips.*
 
@@ -16,3 +16,4 @@ Disassembly of section \.text:
   10:  aca40000        sw      a0,0\(a1\)
   14:  03e00008        jr      ra
   18:  00000000        nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/eret-3.s b/gas/testsuite/gas/mips/eret-3.s
index cebe260..d6b6d5c 100644 (file)
--- a/gas/testsuite/gas/mips/eret-3.s
+++ b/gas/testsuite/gas/mips/eret-3.s
@@ -12,3 +12,6 @@ bar:
 1:
        jr      $31
        .end    bar
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+        .space 8