From: Maciej W. Rozycki <macro@linux-mips.org>
Date: Mon, 21 Sep 2009 13:10:07 +0000 (+0000)
Subject: 	* gas/mips/eret-1.s: Add trailing padding.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0bcd05a426cae092fdab022ec6e5103f937a4738;p=binutils-gdb.git

	* 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 5b400374cb1..0b68cb62b5e 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+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.
diff --git a/gas/testsuite/gas/mips/eret-1.d b/gas/testsuite/gas/mips/eret-1.d
index 1171d2d1f08..4c4e6d3e9b6 100644
--- 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 081d01ef921..088acba1360 100644
--- 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 3b8e4afc07f..a78940f245a 100644
--- 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 4c15f2107b1..dfe1e605faf 100644
--- 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 98346991824..f31afa6010f 100644
--- 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 cebe260b296..d6b6d5ce059 100644
--- 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