* gas/mips/beq.d: Reformat.

	* gas/mips/bge.d, gas/mips/bgeu.d: Likewise.
	* gas/mips/blt.d, gas/mips/bltu.d: Likewise.

6 files changed, 269 insertions, 263 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6a9629e1f16..b284a7ee8d6 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-05  Maciej W. Rozycki  <macro@codesourcery.com>
 
+	* gas/mips/beq.d: Reformat.
+	* gas/mips/bge.d, gas/mips/bgeu.d: Likewise.
+	* gas/mips/blt.d, gas/mips/bltu.d: Likewise.
+
+2010-07-05  Maciej W. Rozycki  <macro@codesourcery.com>
+
 	* gas/mips/beq.d: Remove leftover symbols/relocs from the
 	change on 2009-02-06.
 
diff --git a/gas/testsuite/gas/mips/beq.d b/gas/testsuite/gas/mips/beq.d
index e6254a41626..09971dc565f 100644
--- a/gas/testsuite/gas/mips/beq.d
+++ b/gas/testsuite/gas/mips/beq.d
@@ -6,44 +6,44 @@
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> beq	a0,a1,0+0000 <.*>
-0+0004 <[^>]*> nop
-0+0008 <[^>]*> beqz	a0,0+0000 <.*>
-0+000c <[^>]*> nop
-0+0010 <[^>]*> li	at,1
-0+0014 <[^>]*> beq	a0,at,0+0000 <.*>
-0+0018 <[^>]*> nop
-0+001c <[^>]*> li	at,0x8000
-0+0020 <[^>]*> beq	a0,at,0+0000 <.*>
-0+0024 <[^>]*> nop
-0+0028 <[^>]*> li	at,-32768
-0+002c <[^>]*> beq	a0,at,0+0000 <.*>
-0+0030 <[^>]*> nop
-0+0034 <[^>]*> lui	at,0x1
-0+0038 <[^>]*> beq	a0,at,0+0000 <.*>
-0+003c <[^>]*> nop
-0+0040 <[^>]*> lui	at,0x1
-0+0044 <[^>]*> ori	at,at,0xa5a5
-0+0048 <[^>]*> beq	a0,at,0+0000 <.*>
-0+004c <[^>]*> nop
-0+0050 <[^>]*> bnez	a0,0+0000 <.*>
-0+0054 <[^>]*> nop
-0+0058 <[^>]*> beqzl	a0,0+0000 <.*>
-0+005c <[^>]*> nop
-0+0060 <[^>]*> bnezl	a0,0+0000 <.*>
-0+0064 <[^>]*> nop
-	...
-0+20068 <[^>]*> j	0+0000 <.*>
-[ 	]*20068: (MIPS_JMP|JMPADDR|R_MIPS_26)	.text
-0+2006c <[^>]*> nop
-0+20070 <[^>]*> jal	0+0000 <.*>
-[ 	]*20070: (MIPS_JMP|JMPADDR|R_MIPS_26)	.text
-0+20074 <[^>]*> nop
-#0+20078 <[^>]*> b	0+20078 <.*\+0x20078>
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> beq	a0,a1,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> beqz	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> li	at,1
+[0-9a-f]+ <[^>]*> beq	a0,at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> li	at,0x8000
+[0-9a-f]+ <[^>]*> beq	a0,at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> li	at,-32768
+[0-9a-f]+ <[^>]*> beq	a0,at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> beq	a0,at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
+[0-9a-f]+ <[^>]*> beq	a0,at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bnez	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> beqzl	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bnezl	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+	\.\.\.
+[0-9a-f]+ <[^>]*> j	0+0000 <.*>
+[ 	]*20068: (MIPS_JMP|JMPADDR|R_MIPS_26)	\.text
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> jal	0+0000 <.*>
+[ 	]*20070: (MIPS_JMP|JMPADDR|R_MIPS_26)	\.text
+[0-9a-f]+ <[^>]*> nop
+#[0-9a-f]+ <[^>]*> b	0+20078 <.*\+0x20078>
 #[ 	]*20078: .*16	external_label
-#0+2007c <[^>]*> nop
-#0+20080 <[^>]*> bal	0+20080 <.*\+0x20080>
+#[0-9a-f]+ <[^>]*> nop
+#[0-9a-f]+ <[^>]*> bal	0+20080 <.*\+0x20080>
 #[ 	]*20080: .*16	external_label
-#0+20084 <[^>]*> nop
-	...
+#[0-9a-f]+ <[^>]*> nop
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/bge.d b/gas/testsuite/gas/mips/bge.d
index 97cfa494a9b..56041287d94 100644
--- a/gas/testsuite/gas/mips/bge.d
+++ b/gas/testsuite/gas/mips/bge.d
@@ -6,66 +6,66 @@
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> slt	at,a0,a1
-0+0004 <[^>]*> beqz	at,0+0000 <.*>
-0+0008 <[^>]*> nop
-0+000c <[^>]*> bgez	a0,0+0000 <.*>
-0+0010 <[^>]*> nop
-0+0014 <[^>]*> blez	a1,0+0000 <.*>
-0+0018 <[^>]*> nop
-0+001c <[^>]*> bgez	a0,0+0000 <.*>
-0+0020 <[^>]*> nop
-0+0024 <[^>]*> bgtz	a0,0+0000 <.*>
-0+0028 <[^>]*> nop
-0+002c <[^>]*> slti	at,a0,2
-0+0030 <[^>]*> beqz	at,0+0000 <.*>
-0+0034 <[^>]*> nop
-0+0038 <[^>]*> li	at,0x8000
-0+003c <[^>]*> slt	at,a0,at
-0+0040 <[^>]*> beqz	at,0+0000 <.*>
-0+0044 <[^>]*> nop
-0+0048 <[^>]*> slti	at,a0,-32768
-0+004c <[^>]*> beqz	at,0+0000 <.*>
-0+0050 <[^>]*> nop
-0+0054 <[^>]*> lui	at,0x1
-0+0058 <[^>]*> slt	at,a0,at
-0+005c <[^>]*> beqz	at,0+0000 <.*>
-0+0060 <[^>]*> nop
-0+0064 <[^>]*> lui	at,0x1
-0+0068 <[^>]*> ori	at,at,0xa5a5
-0+006c <[^>]*> slt	at,a0,at
-0+0070 <[^>]*> beqz	at,0+0000 <.*>
-0+0074 <[^>]*> nop
-0+0078 <[^>]*> slt	at,a1,a0
-0+007c <[^>]*> bnez	at,0+0000 <.*>
-0+0080 <[^>]*> nop
-0+0084 <[^>]*> bgtz	a0,0+0000 <.*>
-0+0088 <[^>]*> nop
-0+008c <[^>]*> bltz	a1,0+0000 <.*>
-0+0090 <[^>]*> nop
-0+0094 <[^>]*> bgtz	a0,0+0000 <.*>
-0+0098 <[^>]*> nop
-0+009c <[^>]*> slt	at,a0,a1
-0+00a0 <[^>]*> beqzl	at,0+0000 <.*>
-0+00a4 <[^>]*> nop
-0+00a8 <[^>]*> slt	at,a1,a0
-0+00ac <[^>]*> bnezl	at,0+0000 <.*>
-0+00b0 <[^>]*> nop
-0+00b4 <[^>]*> slt	at,a0,a1
-0+00b8 <[^>]*> beqz	at,000000b8 <.*\+0xb8>
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> slt	at,a0,a1
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bgez	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> blez	a1,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bgez	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bgtz	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slti	at,a0,2
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> li	at,0x8000
+[0-9a-f]+ <[^>]*> slt	at,a0,at
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slti	at,a0,-32768
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> slt	at,a0,at
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
+[0-9a-f]+ <[^>]*> slt	at,a0,at
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a1,a0
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bgtz	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bltz	a1,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bgtz	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a0,a1
+[0-9a-f]+ <[^>]*> beqzl	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a1,a0
+[0-9a-f]+ <[^>]*> bnezl	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a0,a1
+[0-9a-f]+ <[^>]*> beqz	at,0+00b8 <.*\+0xb8>
 [ 	]*b8: .*16	external_label
-0+00bc <[^>]*> nop
-0+00c0 <[^>]*> slt	at,a1,a0
-0+00c4 <[^>]*> bnez	at,000000c4 <.*\+0xc4>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a1,a0
+[0-9a-f]+ <[^>]*> bnez	at,0+00c4 <.*\+0xc4>
 [ 	]*c4: .*16	external_label
-0+00c8 <[^>]*> nop
-0+00cc <[^>]*> slt	at,a0,a1
-0+00d0 <[^>]*> beqzl	at,000000d0 <.*\+0xd0>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a0,a1
+[0-9a-f]+ <[^>]*> beqzl	at,0+00d0 <.*\+0xd0>
 [ 	]*d0: .*16	external_label
-0+00d4 <[^>]*> nop
-0+00d8 <[^>]*> slt	at,a1,a0
-0+00dc <[^>]*> bnezl	at,000000dc <.*\+0xdc>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a1,a0
+[0-9a-f]+ <[^>]*> bnezl	at,0+00dc <.*\+0xdc>
 [ 	]*dc: .*16	external_label
-0+00e0 <[^>]*> nop
-	...
+[0-9a-f]+ <[^>]*> nop
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/bgeu.d b/gas/testsuite/gas/mips/bgeu.d
index a4d40742662..4fb9770f479 100644
--- a/gas/testsuite/gas/mips/bgeu.d
+++ b/gas/testsuite/gas/mips/bgeu.d
@@ -6,60 +6,60 @@
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> sltu	at,a0,a1
-0+0004 <[^>]*> beqz	at,0+0000 <.*>
-0+0008 <[^>]*> nop
-0+000c <[^>]*> beq	zero,a1,0+0000 <.*>
-0+0010 <[^>]*> nop
-0+0014 <[^>]*> bnez	a0,0+0000 <.*>
-0+0018 <[^>]*> nop
-0+001c <[^>]*> sltiu	at,a0,2
-0+0020 <[^>]*> beqz	at,0+0000 <.*>
-0+0024 <[^>]*> nop
-0+0028 <[^>]*> li	at,0x8000
-0+002c <[^>]*> sltu	at,a0,at
-0+0030 <[^>]*> beqz	at,0+0000 <.*>
-0+0034 <[^>]*> nop
-0+0038 <[^>]*> sltiu	at,a0,-32768
-0+003c <[^>]*> beqz	at,0+0000 <.*>
-0+0040 <[^>]*> nop
-0+0044 <[^>]*> lui	at,0x1
-0+0048 <[^>]*> sltu	at,a0,at
-0+004c <[^>]*> beqz	at,0+0000 <.*>
-0+0050 <[^>]*> nop
-0+0054 <[^>]*> lui	at,0x1
-0+0058 <[^>]*> ori	at,at,0xa5a5
-0+005c <[^>]*> sltu	at,a0,at
-0+0060 <[^>]*> beqz	at,0+0000 <.*>
-0+0064 <[^>]*> nop
-0+0068 <[^>]*> sltu	at,a1,a0
-0+006c <[^>]*> bnez	at,0+0000 <.*>
-0+0070 <[^>]*> nop
-0+0074 <[^>]*> bnez	a0,0+0000 <.*>
-0+0078 <[^>]*> nop
-0+007c <[^>]*> bnez	a0,0+0000 <.*>
-0+0080 <[^>]*> nop
-0+0084 <[^>]*> sltu	at,a0,a1
-0+0088 <[^>]*> beqzl	at,0+0000 <.*>
-0+008c <[^>]*> nop
-0+0090 <[^>]*> sltu	at,a1,a0
-0+0094 <[^>]*> bnezl	at,0+0000 <.*>
-0+0098 <[^>]*> nop
-0+009c <[^>]*> sltu	at,a0,a1
-0+00a0 <[^>]*> beqz	at,000000a0 <.*\+0xa0>
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> sltu	at,a0,a1
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> beq	zero,a1,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bnez	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltiu	at,a0,2
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> li	at,0x8000
+[0-9a-f]+ <[^>]*> sltu	at,a0,at
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltiu	at,a0,-32768
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> sltu	at,a0,at
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
+[0-9a-f]+ <[^>]*> sltu	at,a0,at
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a1,a0
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bnez	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bnez	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a0,a1
+[0-9a-f]+ <[^>]*> beqzl	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a1,a0
+[0-9a-f]+ <[^>]*> bnezl	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a0,a1
+[0-9a-f]+ <[^>]*> beqz	at,0+00a0 <.*\+0xa0>
 [ 	]*a0: .*16	external_label
-0+00a4 <[^>]*> nop
-0+00a8 <[^>]*> sltu	at,a1,a0
-0+00ac <[^>]*> bnez	at,000000ac <.*\+0xac>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a1,a0
+[0-9a-f]+ <[^>]*> bnez	at,0+00ac <.*\+0xac>
 [ 	]*ac: .*16	external_label
-0+00b0 <[^>]*> nop
-0+00b4 <[^>]*> sltu	at,a0,a1
-0+00b8 <[^>]*> beqzl	at,000000b8 <.*\+0xb8>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a0,a1
+[0-9a-f]+ <[^>]*> beqzl	at,0+00b8 <.*\+0xb8>
 [ 	]*b8: .*16	external_label
-0+00bc <[^>]*> nop
-0+00c0 <[^>]*> sltu	at,a1,a0
-0+00c4 <[^>]*> bnezl	at,000000c4 <.*\+0xc4>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a1,a0
+[0-9a-f]+ <[^>]*> bnezl	at,0+00c4 <.*\+0xc4>
 [ 	]*c4: .*16	external_label
-0+00c8 <[^>]*> nop
-	...
+[0-9a-f]+ <[^>]*> nop
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/blt.d b/gas/testsuite/gas/mips/blt.d
index 68b16783beb..919a786fab6 100644
--- a/gas/testsuite/gas/mips/blt.d
+++ b/gas/testsuite/gas/mips/blt.d
@@ -6,66 +6,66 @@
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> slt	at,a0,a1
-0+0004 <[^>]*> bnez	at,0+0000 <.*>
-0+0008 <[^>]*> nop
-0+000c <[^>]*> bltz	a0,0+0000 <.*>
-0+0010 <[^>]*> nop
-0+0014 <[^>]*> bgtz	a1,0+0000 <.*>
-0+0018 <[^>]*> nop
-0+001c <[^>]*> bltz	a0,0+0000 <.*>
-0+0020 <[^>]*> nop
-0+0024 <[^>]*> blez	a0,0+0000 <.*>
-0+0028 <[^>]*> nop
-0+002c <[^>]*> slti	at,a0,2
-0+0030 <[^>]*> bnez	at,0+0000 <.*>
-0+0034 <[^>]*> nop
-0+0038 <[^>]*> li	at,0x8000
-0+003c <[^>]*> slt	at,a0,at
-0+0040 <[^>]*> bnez	at,0+0000 <.*>
-0+0044 <[^>]*> nop
-0+0048 <[^>]*> slti	at,a0,-32768
-0+004c <[^>]*> bnez	at,0+0000 <.*>
-0+0050 <[^>]*> nop
-0+0054 <[^>]*> lui	at,0x1
-0+0058 <[^>]*> slt	at,a0,at
-0+005c <[^>]*> bnez	at,0+0000 <.*>
-0+0060 <[^>]*> nop
-0+0064 <[^>]*> lui	at,0x1
-0+0068 <[^>]*> ori	at,at,0xa5a5
-0+006c <[^>]*> slt	at,a0,at
-0+0070 <[^>]*> bnez	at,0+0000 <.*>
-0+0074 <[^>]*> nop
-0+0078 <[^>]*> slt	at,a1,a0
-0+007c <[^>]*> beqz	at,0+0000 <.*>
-0+0080 <[^>]*> nop
-0+0084 <[^>]*> blez	a0,0+0000 <.*>
-0+0088 <[^>]*> nop
-0+008c <[^>]*> bgez	a1,0+0000 <.*>
-0+0090 <[^>]*> nop
-0+0094 <[^>]*> blez	a0,0+0000 <.*>
-0+0098 <[^>]*> nop
-0+009c <[^>]*> slt	at,a0,a1
-0+00a0 <[^>]*> bnezl	at,0+0000 <.*>
-0+00a4 <[^>]*> nop
-0+00a8 <[^>]*> slt	at,a1,a0
-0+00ac <[^>]*> beqzl	at,0+0000 <.*>
-0+00b0 <[^>]*> nop
-0+00b4 <[^>]*> slt	at,a0,a1
-0+00b8 <[^>]*> bnez	at,000000b8 <.*\+0xb8>
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> slt	at,a0,a1
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bltz	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bgtz	a1,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bltz	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> blez	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slti	at,a0,2
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> li	at,0x8000
+[0-9a-f]+ <[^>]*> slt	at,a0,at
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slti	at,a0,-32768
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> slt	at,a0,at
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
+[0-9a-f]+ <[^>]*> slt	at,a0,at
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a1,a0
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> blez	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bgez	a1,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> blez	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a0,a1
+[0-9a-f]+ <[^>]*> bnezl	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a1,a0
+[0-9a-f]+ <[^>]*> beqzl	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a0,a1
+[0-9a-f]+ <[^>]*> bnez	at,0+00b8 <.*\+0xb8>
 [ 	]*b8: .*16	external_label
-0+00bc <[^>]*> nop
-0+00c0 <[^>]*> slt	at,a1,a0
-0+00c4 <[^>]*> beqz	at,000000c4 <.*\+0xc4>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a1,a0
+[0-9a-f]+ <[^>]*> beqz	at,0+00c4 <.*\+0xc4>
 [ 	]*c4: .*16	external_label
-0+00c8 <[^>]*> nop
-0+00cc <[^>]*> slt	at,a0,a1
-0+00d0 <[^>]*> bnezl	at,000000d0 <.*\+0xd0>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a0,a1
+[0-9a-f]+ <[^>]*> bnezl	at,0+00d0 <.*\+0xd0>
 [ 	]*d0: .*16	external_label
-0+00d4 <[^>]*> nop
-0+00d8 <[^>]*> slt	at,a1,a0
-0+00dc <[^>]*> beqzl	at,000000dc <.*\+0xdc>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> slt	at,a1,a0
+[0-9a-f]+ <[^>]*> beqzl	at,0+00dc <.*\+0xdc>
 [ 	]*dc: .*16	external_label
-0+00e0 <[^>]*> nop
-	...
+[0-9a-f]+ <[^>]*> nop
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/bltu.d b/gas/testsuite/gas/mips/bltu.d
index f794b855e59..607809b2e8c 100644
--- a/gas/testsuite/gas/mips/bltu.d
+++ b/gas/testsuite/gas/mips/bltu.d
@@ -6,60 +6,60 @@
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> sltu	at,a0,a1
-0+0004 <[^>]*> bnez	at,0+0000 <.*>
-0+0008 <[^>]*> nop
-0+000c <[^>]*> bne	zero,a1,0+0000 <.*>
-0+0010 <[^>]*> nop
-0+0014 <[^>]*> beqz	a0,0+0000 <.*>
-0+0018 <[^>]*> nop
-0+001c <[^>]*> sltiu	at,a0,2
-0+0020 <[^>]*> bnez	at,0+0000 <.*>
-0+0024 <[^>]*> nop
-0+0028 <[^>]*> li	at,0x8000
-0+002c <[^>]*> sltu	at,a0,at
-0+0030 <[^>]*> bnez	at,0+0000 <.*>
-0+0034 <[^>]*> nop
-0+0038 <[^>]*> sltiu	at,a0,-32768
-0+003c <[^>]*> bnez	at,0+0000 <.*>
-0+0040 <[^>]*> nop
-0+0044 <[^>]*> lui	at,0x1
-0+0048 <[^>]*> sltu	at,a0,at
-0+004c <[^>]*> bnez	at,0+0000 <.*>
-0+0050 <[^>]*> nop
-0+0054 <[^>]*> lui	at,0x1
-0+0058 <[^>]*> ori	at,at,0xa5a5
-0+005c <[^>]*> sltu	at,a0,at
-0+0060 <[^>]*> bnez	at,0+0000 <.*>
-0+0064 <[^>]*> nop
-0+0068 <[^>]*> sltu	at,a1,a0
-0+006c <[^>]*> beqz	at,0+0000 <.*>
-0+0070 <[^>]*> nop
-0+0074 <[^>]*> beqz	a0,0+0000 <.*>
-0+0078 <[^>]*> nop
-0+007c <[^>]*> beqz	a0,0+0000 <.*>
-0+0080 <[^>]*> nop
-0+0084 <[^>]*> sltu	at,a0,a1
-0+0088 <[^>]*> bnezl	at,0+0000 <.*>
-0+008c <[^>]*> nop
-0+0090 <[^>]*> sltu	at,a1,a0
-0+0094 <[^>]*> beqzl	at,0+0000 <.*>
-0+0098 <[^>]*> nop
-0+009c <[^>]*> sltu	at,a0,a1
-0+00a0 <[^>]*> bnez	at,000000a0 <.*\+0xa0>
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> sltu	at,a0,a1
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bne	zero,a1,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> beqz	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltiu	at,a0,2
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> li	at,0x8000
+[0-9a-f]+ <[^>]*> sltu	at,a0,at
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltiu	at,a0,-32768
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> sltu	at,a0,at
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> lui	at,0x1
+[0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
+[0-9a-f]+ <[^>]*> sltu	at,a0,at
+[0-9a-f]+ <[^>]*> bnez	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a1,a0
+[0-9a-f]+ <[^>]*> beqz	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> beqz	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> beqz	a0,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a0,a1
+[0-9a-f]+ <[^>]*> bnezl	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a1,a0
+[0-9a-f]+ <[^>]*> beqzl	at,0+0000 <.*>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a0,a1
+[0-9a-f]+ <[^>]*> bnez	at,0+00a0 <.*\+0xa0>
 [ 	]*a0: .*16	external_label
-0+00a4 <[^>]*> nop
-0+00a8 <[^>]*> sltu	at,a1,a0
-0+00ac <[^>]*> beqz	at,000000ac <.*\+0xac>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a1,a0
+[0-9a-f]+ <[^>]*> beqz	at,0+00ac <.*\+0xac>
 [ 	]*ac: .*16	external_label
-0+00b0 <[^>]*> nop
-0+00b4 <[^>]*> sltu	at,a0,a1
-0+00b8 <[^>]*> bnezl	at,000000b8 <.*\+0xb8>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a0,a1
+[0-9a-f]+ <[^>]*> bnezl	at,0+00b8 <.*\+0xb8>
 [ 	]*b8: .*16	external_label
-0+00bc <[^>]*> nop
-0+00c0 <[^>]*> sltu	at,a1,a0
-0+00c4 <[^>]*> beqzl	at,000000c4 <.*\+0xc4>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> sltu	at,a1,a0
+[0-9a-f]+ <[^>]*> beqzl	at,0+00c4 <.*\+0xc4>
 [ 	]*c4: .*16	external_label
-0+00c8 <[^>]*> nop
-	...
+[0-9a-f]+ <[^>]*> nop
+	\.\.\.