2009-05-26 Catherine Moore <clm@codesourcery.com>

            gas/
            * config/tc-mips.c (check_for_24k_errata): Remove.
            (md_mips_end): Remove call to check_for_24k_errata.
            (start_noreorder): Likewise.
            (s_change_sec): Likewise.
            (s_change_section): Likewise.
            (insns_between): Add 24k errata checks.
            (append_insn): Remove declaration and references to nhdx_24k.
            Remove calls to check_for_24k_errata.

            gas/testsuite:
            * eret.s, eret.d eret.l: Remove.
            * eret-1.s, eret-1.d: New.
            * eret-2.s, eret-2.d: New.
            * eret-3.s, eret-3.d: New.
            * mips.exp: Run new tests.  Remove old tests.

9 files changed, 74 insertions, 6 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 28434ca..76507cd 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2009-05-26  Catherine Moore  <clm@codesourcery.com>
+
+	* gas/mips/eret.s: Remove.
+	* gas/mips/ eret.d: Remove.
+	* gas/mips/eret.l: Remove.
+	* gas/mips/eret-1.s: New.
+	* gas/mips/eret-1.d: New.
+	* gas/mips/eret-2.s: New.
+	* gas/mips/eret-2.d: New.
+	* gas/mips/eret-3.s: New.
+	* gas/mips/eret-3.d: New.
+	* gas/mips/mips.exp: Run new tests.  Remove old tests.
+
 2009-05-23  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* gas/mips/vr4130.s, gas/mips/vr4130.d: Expect part A to have nops.
diff --git a/gas/testsuite/gas/mips/eret.d b/gas/testsuite/gas/mips/eret-1.d
index 1c0124a..1171d2d 100644
--- a/gas/testsuite/gas/mips/eret.d
+++ b/gas/testsuite/gas/mips/eret-1.d
@@ -1,5 +1,5 @@
 #objdump: -d
-#name: MIPS eret disassembly
+#name: MIPS eret-1 disassembly
 #as: -mfix-24k -march=24kc --no-warn
 
 .*\.o:     file format .*mips.*
diff --git a/gas/testsuite/gas/mips/eret.s b/gas/testsuite/gas/mips/eret-1.s
index 081d01e..081d01e 100644
--- a/gas/testsuite/gas/mips/eret.s
+++ b/gas/testsuite/gas/mips/eret-1.s
diff --git a/gas/testsuite/gas/mips/eret-2.d b/gas/testsuite/gas/mips/eret-2.d
new file mode 100644
index 0000000..3b8e4af
--- /dev/null
+++ b/gas/testsuite/gas/mips/eret-2.d
@@ -0,0 +1,16 @@
+#objdump: -d
+#name: MIPS eret-2 disassembly
+#as: -mfix-24k -march=24kc --no-warn
+
+.*\.o:     file format .*mips.*
+
+Disassembly of section \.text:
+
+00000000 <\.text>:
+   0:	42000018 	eret
+   4:	00000000 	nop
+   8:	1000fffd 	b	0x0
+   c:	00000000 	nop
+  10:	42000018 	eret
+  14:	00000000 	nop
+  18:	1000fffd 	b	0x10
diff --git a/gas/testsuite/gas/mips/eret-2.s b/gas/testsuite/gas/mips/eret-2.s
new file mode 100644
index 0000000..4c15f21
--- /dev/null
+++ b/gas/testsuite/gas/mips/eret-2.s
@@ -0,0 +1,9 @@
+	.set	noreorder
+1:	eret
+	.set	reorder
+	b	1b
+
+1:	eret
+	.set	noreorder
+	b	1b
+	.set	reorder
diff --git a/gas/testsuite/gas/mips/eret-3.d b/gas/testsuite/gas/mips/eret-3.d
new file mode 100644
index 0000000..9834699
--- /dev/null
+++ b/gas/testsuite/gas/mips/eret-3.d
@@ -0,0 +1,18 @@
+#objdump: -d
+#name: MIPS eret-3 disassembly
+#as: -mfix-24k -march=24kc --no-warn
+
+.*\.o:     file format .*mips.*
+
+Disassembly of section \.text:
+
+00000000 <foo>:
+   0:	42000018 	eret
+   4:	00000000 	nop
+
+00000008 <bar>:
+   8:	10800002 	beqz	a0,14 <bar\+0xc>
+   c:	00000000 	nop
+  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
new file mode 100644
index 0000000..cebe260
--- /dev/null
+++ b/gas/testsuite/gas/mips/eret-3.s
@@ -0,0 +1,14 @@
+	.globl	foo
+	.ent	foo
+foo:
+	eret
+	.end	foo
+
+	.globl	bar
+	.ent	bar
+bar:
+	beq	$4,$0,1f
+	sw	$4,0($5)
+1:
+	jr	$31
+	.end	bar
diff --git a/gas/testsuite/gas/mips/eret.l b/gas/testsuite/gas/mips/eret.l
deleted file mode 100644
index 327dd95..0000000
--- a/gas/testsuite/gas/mips/eret.l
+++ /dev/null
@@ -1,3 +0,0 @@
-.*\.s: Assembler messages:
-.*\.s:20: Warning: ERET and DERET must be followed by a NOP on the 24K\.
-.*\.s:27: Warning: ERET and DERET must be followed by a NOP on the 24K\.
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 627232f..ebe17c5 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -436,8 +436,9 @@ if { [istarget mips*-*-vxworks*] } {
     } else {
 	run_dump_test "jal"
     }
-    run_dump_test "eret"
-    run_list_test "eret" "-mfix-24k -march=24kc" "MIPS eret warnings"
+    run_dump_test "eret-1"
+    run_dump_test "eret-2"
+    run_dump_test "eret-3"
 
     if $elf { run_dump_test "jal-svr4pic" }
     if $elf { run_dump_test "jal-xgot" }