* gas/mips/beq.d: Make no assumptions about the symbols used as

        branch targets in the disassembly, or the names of the relocs
        produced.
        * gas/mips/bge.d: Likewise.
        * gas/mips/bgeu.d: Likewise.
        * gas/mips/blt.d: Likewise.
        * gas/mips/bltu.d: Likewise.
        * gas/mips/mips32-sf32.d: Likewise.
        * gas/mips/mips1-fp.d: Likewise.
        * gas/mips/branch-misc-1.d: Skip for the mips-ecoff target.
        * gas/mips/branch-misc-2-64.d: Likewise.
        * gas/mips/branch-misc-2.d: Likewise.
        * gas/mips/branch-misc-2pic-64.d: Likewise.
        * gas/mips/branch-misc-2pic.d: Likewise.
        * gas/mips/branch-swap.d: Likewise.

14 files changed, 129 insertions, 105 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 1dd0626d1c..b8d4f752f8 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,8 +1,26 @@
 2009-02-06  Nick Clifton  <nickc@redhat.com>
 
+	* gas/mips/beq.d: Make no assumptions about the symbols used as
+	branch targets in the disassembly, or the names of the relocs
+	produced.
+	* gas/mips/bge.d: Likewise.
+	* gas/mips/bgeu.d: Likewise.
+	* gas/mips/blt.d: Likewise.
+	* gas/mips/bltu.d: Likewise.
+	* gas/mips/mips32-sf32.d: Likewise.
+	* gas/mips/mips1-fp.d: Likewise.
+	* gas/mips/branch-misc-1.d: Skip for the mips-ecoff target.
+	* gas/mips/branch-misc-2-64.d: Likewise.
+	* gas/mips/branch-misc-2.d: Likewise.
+	* gas/mips/branch-misc-2pic-64.d: Likewise.
+	* gas/mips/branch-misc-2pic.d: Likewise.
+	* gas/mips/branch-swap.d: Likewise.
+
+2009-02-06  Nick Clifton  <nickc@redhat.com>
+
 	* gas/elf/symtab.d: But do not run the test for the Alpha or HPPA
 	ports.
-
+	
 2009-02-05  Peter Bergner  <bergner@vnet.ibm.com>
 
 	* gas/ppc/booke.s ("dcbt", "dcbtst"): New tests.
diff --git a/gas/testsuite/gas/mips/beq.d b/gas/testsuite/gas/mips/beq.d
index 824f4bfc9d..55aea97c57 100644
--- a/gas/testsuite/gas/mips/beq.d
+++ b/gas/testsuite/gas/mips/beq.d
@@ -7,37 +7,37 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-0+0000 <[^>]*> beq	a0,a1,0+0000 <text_label>
+0+0000 <[^>]*> beq	a0,a1,0+0000 <.*>
 0+0004 <[^>]*> nop
-0+0008 <[^>]*> beqz	a0,0+0000 <text_label>
+0+0008 <[^>]*> beqz	a0,0+0000 <.*>
 0+000c <[^>]*> nop
 0+0010 <[^>]*> li	at,1
-0+0014 <[^>]*> beq	a0,at,0+0000 <text_label>
+0+0014 <[^>]*> beq	a0,at,0+0000 <.*>
 0+0018 <[^>]*> nop
 0+001c <[^>]*> li	at,0x8000
-0+0020 <[^>]*> beq	a0,at,0+0000 <text_label>
+0+0020 <[^>]*> beq	a0,at,0+0000 <.*>
 0+0024 <[^>]*> nop
 0+0028 <[^>]*> li	at,-32768
-0+002c <[^>]*> beq	a0,at,0+0000 <text_label>
+0+002c <[^>]*> beq	a0,at,0+0000 <.*>
 0+0030 <[^>]*> nop
 0+0034 <[^>]*> lui	at,0x1
-0+0038 <[^>]*> beq	a0,at,0+0000 <text_label>
+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 <text_label>
+0+0048 <[^>]*> beq	a0,at,0+0000 <.*>
 0+004c <[^>]*> nop
-0+0050 <[^>]*> bnez	a0,0+0000 <text_label>
+0+0050 <[^>]*> bnez	a0,0+0000 <.*>
 0+0054 <[^>]*> nop
-0+0058 <[^>]*> beqzl	a0,0+0000 <text_label>
+0+0058 <[^>]*> beqzl	a0,0+0000 <.*>
 0+005c <[^>]*> nop
-0+0060 <[^>]*> bnezl	a0,0+0000 <text_label>
+0+0060 <[^>]*> bnezl	a0,0+0000 <.*>
 0+0064 <[^>]*> nop
 	...
-0+20068 <[^>]*> j	0+0000 <text_label>
+0+20068 <[^>]*> j	0+0000 <.*>
 [ 	]*20068: (MIPS_JMP|JMPADDR|R_MIPS_26)	.text
 0+2006c <[^>]*> nop
-0+20070 <[^>]*> jal	0+0000 <text_label>
+0+20070 <[^>]*> jal	0+0000 <.*>
 [ 	]*20070: (MIPS_JMP|JMPADDR|R_MIPS_26)	.text
 0+20074 <[^>]*> nop
 #0+20078 <[^>]*> b	0+20078 <text_label\+0x20078>
diff --git a/gas/testsuite/gas/mips/bge.d b/gas/testsuite/gas/mips/bge.d
index 2ef285088b..97cfa494a9 100644
--- a/gas/testsuite/gas/mips/bge.d
+++ b/gas/testsuite/gas/mips/bge.d
@@ -8,64 +8,64 @@
 
 Disassembly of section .text:
 0+0000 <[^>]*> slt	at,a0,a1
-0+0004 <[^>]*> beqz	at,0+0000 <text_label>
+0+0004 <[^>]*> beqz	at,0+0000 <.*>
 0+0008 <[^>]*> nop
-0+000c <[^>]*> bgez	a0,0+0000 <text_label>
+0+000c <[^>]*> bgez	a0,0+0000 <.*>
 0+0010 <[^>]*> nop
-0+0014 <[^>]*> blez	a1,0+0000 <text_label>
+0+0014 <[^>]*> blez	a1,0+0000 <.*>
 0+0018 <[^>]*> nop
-0+001c <[^>]*> bgez	a0,0+0000 <text_label>
+0+001c <[^>]*> bgez	a0,0+0000 <.*>
 0+0020 <[^>]*> nop
-0+0024 <[^>]*> bgtz	a0,0+0000 <text_label>
+0+0024 <[^>]*> bgtz	a0,0+0000 <.*>
 0+0028 <[^>]*> nop
 0+002c <[^>]*> slti	at,a0,2
-0+0030 <[^>]*> beqz	at,0+0000 <text_label>
+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 <text_label>
+0+0040 <[^>]*> beqz	at,0+0000 <.*>
 0+0044 <[^>]*> nop
 0+0048 <[^>]*> slti	at,a0,-32768
-0+004c <[^>]*> beqz	at,0+0000 <text_label>
+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 <text_label>
+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 <text_label>
+0+0070 <[^>]*> beqz	at,0+0000 <.*>
 0+0074 <[^>]*> nop
 0+0078 <[^>]*> slt	at,a1,a0
-0+007c <[^>]*> bnez	at,0+0000 <text_label>
+0+007c <[^>]*> bnez	at,0+0000 <.*>
 0+0080 <[^>]*> nop
-0+0084 <[^>]*> bgtz	a0,0+0000 <text_label>
+0+0084 <[^>]*> bgtz	a0,0+0000 <.*>
 0+0088 <[^>]*> nop
-0+008c <[^>]*> bltz	a1,0+0000 <text_label>
+0+008c <[^>]*> bltz	a1,0+0000 <.*>
 0+0090 <[^>]*> nop
-0+0094 <[^>]*> bgtz	a0,0+0000 <text_label>
+0+0094 <[^>]*> bgtz	a0,0+0000 <.*>
 0+0098 <[^>]*> nop
 0+009c <[^>]*> slt	at,a0,a1
-0+00a0 <[^>]*> beqzl	at,0+0000 <text_label>
+0+00a0 <[^>]*> beqzl	at,0+0000 <.*>
 0+00a4 <[^>]*> nop
 0+00a8 <[^>]*> slt	at,a1,a0
-0+00ac <[^>]*> bnezl	at,0+0000 <text_label>
+0+00ac <[^>]*> bnezl	at,0+0000 <.*>
 0+00b0 <[^>]*> nop
 0+00b4 <[^>]*> slt	at,a0,a1
-0+00b8 <[^>]*> beqz	at,000000b8 <text_label\+0xb8>
-[ 	]*b8: R_MIPS_PC16	external_label
+0+00b8 <[^>]*> beqz	at,000000b8 <.*\+0xb8>
+[ 	]*b8: .*16	external_label
 0+00bc <[^>]*> nop
 0+00c0 <[^>]*> slt	at,a1,a0
-0+00c4 <[^>]*> bnez	at,000000c4 <text_label\+0xc4>
-[ 	]*c4: R_MIPS_PC16	external_label
+0+00c4 <[^>]*> bnez	at,000000c4 <.*\+0xc4>
+[ 	]*c4: .*16	external_label
 0+00c8 <[^>]*> nop
 0+00cc <[^>]*> slt	at,a0,a1
-0+00d0 <[^>]*> beqzl	at,000000d0 <text_label\+0xd0>
-[ 	]*d0: R_MIPS_PC16	external_label
+0+00d0 <[^>]*> beqzl	at,000000d0 <.*\+0xd0>
+[ 	]*d0: .*16	external_label
 0+00d4 <[^>]*> nop
 0+00d8 <[^>]*> slt	at,a1,a0
-0+00dc <[^>]*> bnezl	at,000000dc <text_label\+0xdc>
-[ 	]*dc: R_MIPS_PC16	external_label
+0+00dc <[^>]*> bnezl	at,000000dc <.*\+0xdc>
+[ 	]*dc: .*16	external_label
 0+00e0 <[^>]*> nop
 	...
diff --git a/gas/testsuite/gas/mips/bgeu.d b/gas/testsuite/gas/mips/bgeu.d
index 4c0753b3f0..a4d4074266 100644
--- a/gas/testsuite/gas/mips/bgeu.d
+++ b/gas/testsuite/gas/mips/bgeu.d
@@ -8,58 +8,58 @@
 
 Disassembly of section .text:
 0+0000 <[^>]*> sltu	at,a0,a1
-0+0004 <[^>]*> beqz	at,0+0000 <text_label>
+0+0004 <[^>]*> beqz	at,0+0000 <.*>
 0+0008 <[^>]*> nop
-0+000c <[^>]*> beq	zero,a1,0+0000 <text_label>
+0+000c <[^>]*> beq	zero,a1,0+0000 <.*>
 0+0010 <[^>]*> nop
-0+0014 <[^>]*> bnez	a0,0+0000 <text_label>
+0+0014 <[^>]*> bnez	a0,0+0000 <.*>
 0+0018 <[^>]*> nop
 0+001c <[^>]*> sltiu	at,a0,2
-0+0020 <[^>]*> beqz	at,0+0000 <text_label>
+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 <text_label>
+0+0030 <[^>]*> beqz	at,0+0000 <.*>
 0+0034 <[^>]*> nop
 0+0038 <[^>]*> sltiu	at,a0,-32768
-0+003c <[^>]*> beqz	at,0+0000 <text_label>
+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 <text_label>
+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 <text_label>
+0+0060 <[^>]*> beqz	at,0+0000 <.*>
 0+0064 <[^>]*> nop
 0+0068 <[^>]*> sltu	at,a1,a0
-0+006c <[^>]*> bnez	at,0+0000 <text_label>
+0+006c <[^>]*> bnez	at,0+0000 <.*>
 0+0070 <[^>]*> nop
-0+0074 <[^>]*> bnez	a0,0+0000 <text_label>
+0+0074 <[^>]*> bnez	a0,0+0000 <.*>
 0+0078 <[^>]*> nop
-0+007c <[^>]*> bnez	a0,0+0000 <text_label>
+0+007c <[^>]*> bnez	a0,0+0000 <.*>
 0+0080 <[^>]*> nop
 0+0084 <[^>]*> sltu	at,a0,a1
-0+0088 <[^>]*> beqzl	at,0+0000 <text_label>
+0+0088 <[^>]*> beqzl	at,0+0000 <.*>
 0+008c <[^>]*> nop
 0+0090 <[^>]*> sltu	at,a1,a0
-0+0094 <[^>]*> bnezl	at,0+0000 <text_label>
+0+0094 <[^>]*> bnezl	at,0+0000 <.*>
 0+0098 <[^>]*> nop
 0+009c <[^>]*> sltu	at,a0,a1
-0+00a0 <[^>]*> beqz	at,000000a0 <text_label\+0xa0>
-[ 	]*a0: R_MIPS_PC16	external_label
+0+00a0 <[^>]*> beqz	at,000000a0 <.*\+0xa0>
+[ 	]*a0: .*16	external_label
 0+00a4 <[^>]*> nop
 0+00a8 <[^>]*> sltu	at,a1,a0
-0+00ac <[^>]*> bnez	at,000000ac <text_label\+0xac>
-[ 	]*ac: R_MIPS_PC16	external_label
+0+00ac <[^>]*> bnez	at,000000ac <.*\+0xac>
+[ 	]*ac: .*16	external_label
 0+00b0 <[^>]*> nop
 0+00b4 <[^>]*> sltu	at,a0,a1
-0+00b8 <[^>]*> beqzl	at,000000b8 <text_label\+0xb8>
-[ 	]*b8: R_MIPS_PC16	external_label
+0+00b8 <[^>]*> beqzl	at,000000b8 <.*\+0xb8>
+[ 	]*b8: .*16	external_label
 0+00bc <[^>]*> nop
 0+00c0 <[^>]*> sltu	at,a1,a0
-0+00c4 <[^>]*> bnezl	at,000000c4 <text_label\+0xc4>
-[ 	]*c4: R_MIPS_PC16	external_label
+0+00c4 <[^>]*> bnezl	at,000000c4 <.*\+0xc4>
+[ 	]*c4: .*16	external_label
 0+00c8 <[^>]*> nop
 	...
diff --git a/gas/testsuite/gas/mips/blt.d b/gas/testsuite/gas/mips/blt.d
index fb2914aa07..68b16783be 100644
--- a/gas/testsuite/gas/mips/blt.d
+++ b/gas/testsuite/gas/mips/blt.d
@@ -8,64 +8,64 @@
 
 Disassembly of section .text:
 0+0000 <[^>]*> slt	at,a0,a1
-0+0004 <[^>]*> bnez	at,0+0000 <text_label>
+0+0004 <[^>]*> bnez	at,0+0000 <.*>
 0+0008 <[^>]*> nop
-0+000c <[^>]*> bltz	a0,0+0000 <text_label>
+0+000c <[^>]*> bltz	a0,0+0000 <.*>
 0+0010 <[^>]*> nop
-0+0014 <[^>]*> bgtz	a1,0+0000 <text_label>
+0+0014 <[^>]*> bgtz	a1,0+0000 <.*>
 0+0018 <[^>]*> nop
-0+001c <[^>]*> bltz	a0,0+0000 <text_label>
+0+001c <[^>]*> bltz	a0,0+0000 <.*>
 0+0020 <[^>]*> nop
-0+0024 <[^>]*> blez	a0,0+0000 <text_label>
+0+0024 <[^>]*> blez	a0,0+0000 <.*>
 0+0028 <[^>]*> nop
 0+002c <[^>]*> slti	at,a0,2
-0+0030 <[^>]*> bnez	at,0+0000 <text_label>
+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 <text_label>
+0+0040 <[^>]*> bnez	at,0+0000 <.*>
 0+0044 <[^>]*> nop
 0+0048 <[^>]*> slti	at,a0,-32768
-0+004c <[^>]*> bnez	at,0+0000 <text_label>
+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 <text_label>
+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 <text_label>
+0+0070 <[^>]*> bnez	at,0+0000 <.*>
 0+0074 <[^>]*> nop
 0+0078 <[^>]*> slt	at,a1,a0
-0+007c <[^>]*> beqz	at,0+0000 <text_label>
+0+007c <[^>]*> beqz	at,0+0000 <.*>
 0+0080 <[^>]*> nop
-0+0084 <[^>]*> blez	a0,0+0000 <text_label>
+0+0084 <[^>]*> blez	a0,0+0000 <.*>
 0+0088 <[^>]*> nop
-0+008c <[^>]*> bgez	a1,0+0000 <text_label>
+0+008c <[^>]*> bgez	a1,0+0000 <.*>
 0+0090 <[^>]*> nop
-0+0094 <[^>]*> blez	a0,0+0000 <text_label>
+0+0094 <[^>]*> blez	a0,0+0000 <.*>
 0+0098 <[^>]*> nop
 0+009c <[^>]*> slt	at,a0,a1
-0+00a0 <[^>]*> bnezl	at,0+0000 <text_label>
+0+00a0 <[^>]*> bnezl	at,0+0000 <.*>
 0+00a4 <[^>]*> nop
 0+00a8 <[^>]*> slt	at,a1,a0
-0+00ac <[^>]*> beqzl	at,0+0000 <text_label>
+0+00ac <[^>]*> beqzl	at,0+0000 <.*>
 0+00b0 <[^>]*> nop
 0+00b4 <[^>]*> slt	at,a0,a1
-0+00b8 <[^>]*> bnez	at,000000b8 <text_label\+0xb8>
-[ 	]*b8: R_MIPS_PC16	external_label
+0+00b8 <[^>]*> bnez	at,000000b8 <.*\+0xb8>
+[ 	]*b8: .*16	external_label
 0+00bc <[^>]*> nop
 0+00c0 <[^>]*> slt	at,a1,a0
-0+00c4 <[^>]*> beqz	at,000000c4 <text_label\+0xc4>
-[ 	]*c4: R_MIPS_PC16	external_label
+0+00c4 <[^>]*> beqz	at,000000c4 <.*\+0xc4>
+[ 	]*c4: .*16	external_label
 0+00c8 <[^>]*> nop
 0+00cc <[^>]*> slt	at,a0,a1
-0+00d0 <[^>]*> bnezl	at,000000d0 <text_label\+0xd0>
-[ 	]*d0: R_MIPS_PC16	external_label
+0+00d0 <[^>]*> bnezl	at,000000d0 <.*\+0xd0>
+[ 	]*d0: .*16	external_label
 0+00d4 <[^>]*> nop
 0+00d8 <[^>]*> slt	at,a1,a0
-0+00dc <[^>]*> beqzl	at,000000dc <text_label\+0xdc>
-[ 	]*dc: R_MIPS_PC16	external_label
+0+00dc <[^>]*> beqzl	at,000000dc <.*\+0xdc>
+[ 	]*dc: .*16	external_label
 0+00e0 <[^>]*> nop
 	...
diff --git a/gas/testsuite/gas/mips/bltu.d b/gas/testsuite/gas/mips/bltu.d
index 308afdf95d..f794b855e5 100644
--- a/gas/testsuite/gas/mips/bltu.d
+++ b/gas/testsuite/gas/mips/bltu.d
@@ -8,58 +8,58 @@
 
 Disassembly of section .text:
 0+0000 <[^>]*> sltu	at,a0,a1
-0+0004 <[^>]*> bnez	at,0+0000 <text_label>
+0+0004 <[^>]*> bnez	at,0+0000 <.*>
 0+0008 <[^>]*> nop
-0+000c <[^>]*> bne	zero,a1,0+0000 <text_label>
+0+000c <[^>]*> bne	zero,a1,0+0000 <.*>
 0+0010 <[^>]*> nop
-0+0014 <[^>]*> beqz	a0,0+0000 <text_label>
+0+0014 <[^>]*> beqz	a0,0+0000 <.*>
 0+0018 <[^>]*> nop
 0+001c <[^>]*> sltiu	at,a0,2
-0+0020 <[^>]*> bnez	at,0+0000 <text_label>
+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 <text_label>
+0+0030 <[^>]*> bnez	at,0+0000 <.*>
 0+0034 <[^>]*> nop
 0+0038 <[^>]*> sltiu	at,a0,-32768
-0+003c <[^>]*> bnez	at,0+0000 <text_label>
+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 <text_label>
+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 <text_label>
+0+0060 <[^>]*> bnez	at,0+0000 <.*>
 0+0064 <[^>]*> nop
 0+0068 <[^>]*> sltu	at,a1,a0
-0+006c <[^>]*> beqz	at,0+0000 <text_label>
+0+006c <[^>]*> beqz	at,0+0000 <.*>
 0+0070 <[^>]*> nop
-0+0074 <[^>]*> beqz	a0,0+0000 <text_label>
+0+0074 <[^>]*> beqz	a0,0+0000 <.*>
 0+0078 <[^>]*> nop
-0+007c <[^>]*> beqz	a0,0+0000 <text_label>
+0+007c <[^>]*> beqz	a0,0+0000 <.*>
 0+0080 <[^>]*> nop
 0+0084 <[^>]*> sltu	at,a0,a1
-0+0088 <[^>]*> bnezl	at,0+0000 <text_label>
+0+0088 <[^>]*> bnezl	at,0+0000 <.*>
 0+008c <[^>]*> nop
 0+0090 <[^>]*> sltu	at,a1,a0
-0+0094 <[^>]*> beqzl	at,0+0000 <text_label>
+0+0094 <[^>]*> beqzl	at,0+0000 <.*>
 0+0098 <[^>]*> nop
 0+009c <[^>]*> sltu	at,a0,a1
-0+00a0 <[^>]*> bnez	at,000000a0 <text_label\+0xa0>
-[ 	]*a0: R_MIPS_PC16	external_label
+0+00a0 <[^>]*> bnez	at,000000a0 <.*\+0xa0>
+[ 	]*a0: .*16	external_label
 0+00a4 <[^>]*> nop
 0+00a8 <[^>]*> sltu	at,a1,a0
-0+00ac <[^>]*> beqz	at,000000ac <text_label\+0xac>
-[ 	]*ac: R_MIPS_PC16	external_label
+0+00ac <[^>]*> beqz	at,000000ac <.*\+0xac>
+[ 	]*ac: .*16	external_label
 0+00b0 <[^>]*> nop
 0+00b4 <[^>]*> sltu	at,a0,a1
-0+00b8 <[^>]*> bnezl	at,000000b8 <text_label\+0xb8>
-[ 	]*b8: R_MIPS_PC16	external_label
+0+00b8 <[^>]*> bnezl	at,000000b8 <.*\+0xb8>
+[ 	]*b8: .*16	external_label
 0+00bc <[^>]*> nop
 0+00c0 <[^>]*> sltu	at,a1,a0
-0+00c4 <[^>]*> beqzl	at,000000c4 <text_label\+0xc4>
-[ 	]*c4: R_MIPS_PC16	external_label
+0+00c4 <[^>]*> beqzl	at,000000c4 <.*\+0xc4>
+[ 	]*c4: .*16	external_label
 0+00c8 <[^>]*> nop
 	...
diff --git a/gas/testsuite/gas/mips/branch-misc-1.d b/gas/testsuite/gas/mips/branch-misc-1.d
index 1c5f26bd1c..245f0296ac 100644
--- a/gas/testsuite/gas/mips/branch-misc-1.d
+++ b/gas/testsuite/gas/mips/branch-misc-1.d
@@ -1,3 +1,4 @@
+#skip: mips-*-ecoff
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS branch-misc-1
 #as: -32
diff --git a/gas/testsuite/gas/mips/branch-misc-2-64.d b/gas/testsuite/gas/mips/branch-misc-2-64.d
index 0b56d976df..064c42fc26 100644
--- a/gas/testsuite/gas/mips/branch-misc-2-64.d
+++ b/gas/testsuite/gas/mips/branch-misc-2-64.d
@@ -1,3 +1,4 @@
+#skip: mips-*-ecoff
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS branch-misc-2-64
 #source: branch-misc-2.s
diff --git a/gas/testsuite/gas/mips/branch-misc-2.d b/gas/testsuite/gas/mips/branch-misc-2.d
index 7ba5dbc24a..ffd823c7b6 100644
--- a/gas/testsuite/gas/mips/branch-misc-2.d
+++ b/gas/testsuite/gas/mips/branch-misc-2.d
@@ -1,3 +1,4 @@
+#skip: mips-*-ecoff
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS branch-misc-2
 #as: -32 -non_shared
diff --git a/gas/testsuite/gas/mips/branch-misc-2pic-64.d b/gas/testsuite/gas/mips/branch-misc-2pic-64.d
index 31bb81dc4d..6b8720da18 100644
--- a/gas/testsuite/gas/mips/branch-misc-2pic-64.d
+++ b/gas/testsuite/gas/mips/branch-misc-2pic-64.d
@@ -1,3 +1,4 @@
+#skip: mips-*-ecoff
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS branch-misc-2pic-64
 #source: branch-misc-2.s
diff --git a/gas/testsuite/gas/mips/branch-misc-2pic.d b/gas/testsuite/gas/mips/branch-misc-2pic.d
index 516b490b69..5b42b29603 100644
--- a/gas/testsuite/gas/mips/branch-misc-2pic.d
+++ b/gas/testsuite/gas/mips/branch-misc-2pic.d
@@ -1,3 +1,4 @@
+#skip: mips-*-ecoff
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS branch-misc-2pic
 #source: branch-misc-2.s
diff --git a/gas/testsuite/gas/mips/branch-swap.d b/gas/testsuite/gas/mips/branch-swap.d
index 273dee99f2..0825982c62 100644
--- a/gas/testsuite/gas/mips/branch-swap.d
+++ b/gas/testsuite/gas/mips/branch-swap.d
@@ -1,3 +1,4 @@
+#skip: mips-*-ecoff
 #as: -march=mips2 -32
 #objdump: -dr
 #name: MIPS branch-swap
diff --git a/gas/testsuite/gas/mips/mips1-fp.d b/gas/testsuite/gas/mips/mips1-fp.d
index a681a30f36..1ab89ca8bf 100644
--- a/gas/testsuite/gas/mips/mips1-fp.d
+++ b/gas/testsuite/gas/mips/mips1-fp.d
@@ -6,7 +6,7 @@
 
 Disassembly of section .text:
 
-[0-9a-f]+ <foo>:
+[0-9a-f]+ <.*>:
 .*:	46041000 	add.s	\$f0,\$f2,\$f4
 .*:	44420000 	cfc1	\$2,\$0
 #pass
diff --git a/gas/testsuite/gas/mips/mips32-sf32.d b/gas/testsuite/gas/mips/mips32-sf32.d
index 4de9844d26..128dec52f1 100644
--- a/gas/testsuite/gas/mips/mips32-sf32.d
+++ b/gas/testsuite/gas/mips/mips32-sf32.d
@@ -10,7 +10,7 @@ Disassembly of section .text:
 0+0000 <[^>]*> 3c013f80 	lui	\$1,0x3f80
 0+0004 <[^>]*> 44810800 	mtc1	\$1,\$f1
 0+0008 <[^>]*> c783c000 	lwc1	\$f3,-16384\(\$28\)
-			8: R_MIPS_LITERAL	\.lit4\+0x4000
+			8:.*LITERAL	\.lit4\+0x4000
 0+000c <[^>]*> 46030940 	add.s	\$f5,\$f1,\$f3
 0+0010 <[^>]*> 46003a21 	cvt.d.s	\$f8,\$f7
 0+0014 <[^>]*> 46803a21 	cvt.d.w	\$f8,\$f7