* gas/mips/eret-1.d: Adjust regexps for robustness.

* gas/mips/eret-2.d: Likewise.
	* gas/mips/eret-3.d: Likewise.
	* gas/mips/eret-1.s: Reformat for readability.  Add a label
	at the beginning.
	* gas/mips/eret-2.s: Add a label at the beginning.

gas/testsuite/ChangeLog

@@ -1,3 +1,12 @@
+2009-09-21  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* gas/mips/eret-1.d: Adjust regexps for robustness.
+	* gas/mips/eret-2.d: Likewise.
+	* gas/mips/eret-3.d: Likewise.
+	* gas/mips/eret-1.s: Reformat for readability.  Add a label
+	at the beginning.
+	* gas/mips/eret-2.s: Add a label at the beginning.
+
 2009-09-21  Maciej W. Rozycki  <macro@linux-mips.org>
 
 	* gas/mips/eret-1.s: Add trailing padding.

gas/testsuite/gas/mips/eret-1.d

@@ -6,37 +6,37 @@
 
 Disassembly of section \.text:
 
-00000000 <\.text>:
-   0:	240c0000 	li	t4,0
-   4:	42000018 	eret
-   8:	00000000 	nop
-   c:	10000003 	b	0x1c
-  10:	00000000 	nop
-  14:	240a0003 	li	t2,3
-  18:	42000018 	eret
-  1c:	24040000 	li	a0,0
-  20:	4200001f 	deret
-  24:	00000000 	nop
-  28:	116afffa 	beq	t3,t2,0x14
-  2c:	00000000 	nop
-  30:	4200001f 	deret
-  34:	00000000 	nop
-  38:	42000018 	eret
-  3c:	00000000 	nop
-  40:	42000018 	eret
-  44:	00000000 	nop
-  48:	1000fff4 	b	0x1c
-  4c:	00000000 	nop
-  50:	240c0004 	li	t4,4
-  54:	4200001f 	deret
-  58:	240c0003 	li	t4,3
-  5c:	42000018 	eret
-  60:	10000005 	b	0x78
-  64:	240c0003 	li	t4,3
-  68:	42000018 	eret
-  6c:	00000000 	nop
-  70:	10000001 	b	0x78
-  74:	240c0003 	li	t4,3
-  78:	240c0003 	li	t4,3
-  7c:	42000018 	eret
+[0-9a-f]+ <foo>:
+[ 0-9a-f]+:	240c0000 	li	t4,0
+[ 0-9a-f]+:	42000018 	eret
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	10000003 	b	[0-9a-f]+ <foo\+0x1c>
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	240a0003 	li	t2,3
+[ 0-9a-f]+:	42000018 	eret
+[ 0-9a-f]+:	24040000 	li	a0,0
+[ 0-9a-f]+:	4200001f 	deret
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	116afffa 	beq	t3,t2,[0-9a-f]+ <foo\+0x14>
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	4200001f 	deret
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	42000018 	eret
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	42000018 	eret
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	1000fff4 	b	[0-9a-f]+ <foo\+0x1c>
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	240c0004 	li	t4,4
+[ 0-9a-f]+:	4200001f 	deret
+[ 0-9a-f]+:	240c0003 	li	t4,3
+[ 0-9a-f]+:	42000018 	eret
+[ 0-9a-f]+:	10000005 	b	[0-9a-f]+ <foo\+0x78>
+[ 0-9a-f]+:	240c0003 	li	t4,3
+[ 0-9a-f]+:	42000018 	eret
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	10000001 	b	[0-9a-f]+ <foo\+0x78>
+[ 0-9a-f]+:	240c0003 	li	t4,3
+[ 0-9a-f]+:	240c0003 	li	t4,3
+[ 0-9a-f]+:	42000018 	eret
 	\.\.\.

gas/testsuite/gas/mips/eret-1.s

@@ -1,29 +1,29 @@
-	.text
-	li $t4, 0
+foo:
+	li	$t4, 0
 	eret
-	b 2f
-1:	li $t2, 3
+	b	2f
+1:	li	$t2, 3
 	eret
-2:	li $a0, 0
+2:	li	$a0, 0
 	deret
-	beq $t3,$t2,1b
+	beq	$t3, $t2, 1b
 	deret
 	eret
 	eret
-	b 2b
+	b	2b
 
 	.set noreorder
-	li $t4, 4
+	li	$t4, 4
 	deret
-	li $t4, 3
+	li	$t4, 3
 	eret
-	b 1f
-	li $t4, 3
+	b	1f
+	 li	$t4, 3
 	eret
 	nop
-	b 1f
-	li $t4, 3
-1:	li $t4, 3
+	b	1f
+	 li	$t4, 3
+1:	li	$t4, 3
 	eret
 
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...

gas/testsuite/gas/mips/eret-2.d

@@ -6,13 +6,13 @@
 
 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
-  1c:	00000000 	nop
+[0-9a-f]+ <foo>:
+[ 0-9a-f]+:	42000018 	eret
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	1000fffd 	b	[0-9a-f]+ <foo>
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	42000018 	eret
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	1000fffd 	b	[0-9a-f]+ <foo\+0x10>
+[ 0-9a-f]+:	00000000 	nop
 	\.\.\.

gas/testsuite/gas/mips/eret-2.s

@@ -1,3 +1,4 @@
+foo:
 	.set	noreorder
 1:	eret
 	.set	reorder

gas/testsuite/gas/mips/eret-3.d

@@ -6,14 +6,14 @@
 
 Disassembly of section \.text:
 
-00000000 <foo>:
-   0:	42000018 	eret
-   4:	00000000 	nop
+[0-9a-f]+ <foo>:
+[ 0-9a-f]+:	42000018 	eret
+[ 0-9a-f]+:	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
+[0-9a-f]+ <bar>:
+[ 0-9a-f]+:	10800002 	beqz	a0,[0-9a-f]+ <bar\+0xc>
+[ 0-9a-f]+:	00000000 	nop
+[ 0-9a-f]+:	aca40000 	sw	a0,0\(a1\)
+[ 0-9a-f]+:	03e00008 	jr	ra
+[ 0-9a-f]+:	00000000 	nop
 	\.\.\.