* gas/mips/beq.d: Comment out branches to undefined symbols,

no longer supported.
* gas/mips/beq.s: Likewise.
* gas/mips/bge.d: Likewise.
* gas/mips/bge.s: Likewise.
* gas/mips/bgeu.d: Likewise.
* gas/mips/bgeu.s: Likewise.
* gas/mips/blt.d: Likewise.
* gas/mips/blt.s: Likewise.
* gas/mips/bltu.d: Likewise.
* gas/mips/bltu.s: Likewise.
* gas/mips/mips.exp: Change branch-misc-2 test to run_list_test.
* gas/mips/branch-misc-2.d: Removed.
* gas/mips/branch-misc-2.s: Added branches to undefined symbols.
* gas/mips/branch-misc-2.l: New.

15 files changed, 122 insertions, 122 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index f3fd8e3..30fdbc4 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2002-12-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* gas/mips/beq.d: Comment out branches to undefined symbols,
+	no longer supported.
+	* gas/mips/beq.s: Likewise.
+	* gas/mips/bge.d: Likewise.
+	* gas/mips/bge.s: Likewise.
+	* gas/mips/bgeu.d: Likewise.
+	* gas/mips/bgeu.s: Likewise.
+	* gas/mips/blt.d: Likewise.
+	* gas/mips/blt.s: Likewise.
+	* gas/mips/bltu.d: Likewise.
+	* gas/mips/bltu.s: Likewise.
+	* gas/mips/mips.exp: Change branch-misc-2 test to run_list_test.
+	* gas/mips/branch-misc-2.d: Removed.
+	* gas/mips/branch-misc-2.s: Added branches to undefined symbols.
+	* gas/mips/branch-misc-2.l: New.
+
+? gas/testsuite/gas/mips/branch-misc-2.l
 2002-12-09  Aldy Hernandez  <aldyh@redhat.com>
 
 	* gas/ppc/booke.d: Fix msync and mbar to reflect reality.
diff --git a/gas/testsuite/gas/mips/beq.d b/gas/testsuite/gas/mips/beq.d
index 2a8abd5..b02e1f5 100644
--- a/gas/testsuite/gas/mips/beq.d
+++ b/gas/testsuite/gas/mips/beq.d
@@ -39,10 +39,10 @@ Disassembly of section .text:
 0+20070 <[^>]*> jal	0+0000 <text_label>
 [ 	]*20070: (MIPS_JMP|JMPADDR|R_MIPS_26)	.text
 0+20074 <[^>]*> nop
-0+20078 <[^>]*> b	0+20078 <text_label\+0x20078>
-[ 	]*20078: R_MIPS_PC16	external_label
-0+2007c <[^>]*> nop
-0+20080 <[^>]*> bal	0+20080 <text_label\+0x20080>
-[ 	]*20080: R_MIPS_PC16	external_label
-0+20084 <[^>]*> nop
+#0+20078 <[^>]*> b	0+20078 <text_label\+0x20078>
+#[ 	]*20078: R_MIPS_PC16	external_label
+#0+2007c <[^>]*> nop
+#0+20080 <[^>]*> bal	0+20080 <text_label\+0x20080>
+#[ 	]*20080: R_MIPS_PC16	external_label
+#0+20084 <[^>]*> nop
 	...
diff --git a/gas/testsuite/gas/mips/beq.s b/gas/testsuite/gas/mips/beq.s
index 66831bb..ae7c750 100644
--- a/gas/testsuite/gas/mips/beq.s
+++ b/gas/testsuite/gas/mips/beq.s
@@ -23,8 +23,8 @@ text_label:
 	bal	text_label
 
 # Branch to an external label.
-	b	external_label
-	bal	external_label
+#	b	external_label
+#	bal	external_label
 
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
 	.space	8
diff --git a/gas/testsuite/gas/mips/bge.d b/gas/testsuite/gas/mips/bge.d
index 26952de..7924c02 100644
--- a/gas/testsuite/gas/mips/bge.d
+++ b/gas/testsuite/gas/mips/bge.d
@@ -51,20 +51,20 @@ Disassembly of section .text:
 0+00a8 <[^>]*> slt	at,a1,a0
 0+00ac <[^>]*> bnezl	at,0+0000 <text_label>
 0+00b0 <[^>]*> nop
-0+00b4 <[^>]*> slt	at,a0,a1
-0+00b8 <[^>]*> beqz	at,000000b8 <text_label\+0xb8>
-[ 	]*b8: R_MIPS_PC16	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+00c8 <[^>]*> nop
-0+00cc <[^>]*> slt	at,a0,a1
-0+00d0 <[^>]*> beqzl	at,000000d0 <text_label\+0xd0>
-[ 	]*d0: R_MIPS_PC16	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+00e0 <[^>]*> nop
+#0+00b4 <[^>]*> slt	at,a0,a1
+#0+00b8 <[^>]*> beqz	at,000000b8 <text_label\+0xb8>
+#[ 	]*b8: R_MIPS_PC16	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+00c8 <[^>]*> nop
+#0+00cc <[^>]*> slt	at,a0,a1
+#0+00d0 <[^>]*> beqzl	at,000000d0 <text_label\+0xd0>
+#[ 	]*d0: R_MIPS_PC16	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+00e0 <[^>]*> nop
 	...
diff --git a/gas/testsuite/gas/mips/bge.s b/gas/testsuite/gas/mips/bge.s
index 4b4e58f..bedab79 100644
--- a/gas/testsuite/gas/mips/bge.s
+++ b/gas/testsuite/gas/mips/bge.s
@@ -25,10 +25,10 @@ text_label:
 	bgtl	$4,$5,text_label
 
 # Branch to an external label.
-	bge	$4,$5,external_label
-	bgt	$4,$5,external_label
-	bgel	$4,$5,external_label
-	bgtl	$4,$5,external_label
+#	bge	$4,$5,external_label
+#	bgt	$4,$5,external_label
+#	bgel	$4,$5,external_label
+#	bgtl	$4,$5,external_label
 
 # Round to a 16 byte boundary, for ease in testing multiple targets.
 	nop
diff --git a/gas/testsuite/gas/mips/bgeu.d b/gas/testsuite/gas/mips/bgeu.d
index ace226e..d927956 100644
--- a/gas/testsuite/gas/mips/bgeu.d
+++ b/gas/testsuite/gas/mips/bgeu.d
@@ -45,20 +45,20 @@ Disassembly of section .text:
 0+0090 <[^>]*> sltu	at,a1,a0
 0+0094 <[^>]*> bnezl	at,0+0000 <text_label>
 0+0098 <[^>]*> nop
-0+009c <[^>]*> sltu	at,a0,a1
-0+00a0 <[^>]*> beqz	at,000000a0 <text_label\+0xa0>
-[ 	]*a0: R_MIPS_PC16	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+00b0 <[^>]*> nop
-0+00b4 <[^>]*> sltu	at,a0,a1
-0+00b8 <[^>]*> beqzl	at,000000b8 <text_label\+0xb8>
-[ 	]*b8: R_MIPS_PC16	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+00c8 <[^>]*> nop
+#0+009c <[^>]*> sltu	at,a0,a1
+#0+00a0 <[^>]*> beqz	at,000000a0 <text_label\+0xa0>
+#[ 	]*a0: R_MIPS_PC16	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+00b0 <[^>]*> nop
+#0+00b4 <[^>]*> sltu	at,a0,a1
+#0+00b8 <[^>]*> beqzl	at,000000b8 <text_label\+0xb8>
+#[ 	]*b8: R_MIPS_PC16	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+00c8 <[^>]*> nop
 	...
diff --git a/gas/testsuite/gas/mips/bgeu.s b/gas/testsuite/gas/mips/bgeu.s
index cccd584..8a5244c 100644
--- a/gas/testsuite/gas/mips/bgeu.s
+++ b/gas/testsuite/gas/mips/bgeu.s
@@ -23,10 +23,10 @@ text_label:
 	bgtul	$4,$5,text_label
 
 # Branch to an external label.
-	bgeu	$4,$5,external_label
-	bgtu	$4,$5,external_label
-	bgeul	$4,$5,external_label
-	bgtul	$4,$5,external_label
+#	bgeu	$4,$5,external_label
+#	bgtu	$4,$5,external_label
+#	bgeul	$4,$5,external_label
+#	bgtul	$4,$5,external_label
 
 # Round to a 16 byte boundary, for ease in testing multiple targets.
 	nop
diff --git a/gas/testsuite/gas/mips/blt.d b/gas/testsuite/gas/mips/blt.d
index fdc7c4b..ca6d8b5 100644
--- a/gas/testsuite/gas/mips/blt.d
+++ b/gas/testsuite/gas/mips/blt.d
@@ -51,20 +51,20 @@ Disassembly of section .text:
 0+00a8 <[^>]*> slt	at,a1,a0
 0+00ac <[^>]*> beqzl	at,0+0000 <text_label>
 0+00b0 <[^>]*> nop
-0+00b4 <[^>]*> slt	at,a0,a1
-0+00b8 <[^>]*> bnez	at,000000b8 <text_label\+0xb8>
-[ 	]*b8: R_MIPS_PC16	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+00c8 <[^>]*> nop
-0+00cc <[^>]*> slt	at,a0,a1
-0+00d0 <[^>]*> bnezl	at,000000d0 <text_label\+0xd0>
-[ 	]*d0: R_MIPS_PC16	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+00e0 <[^>]*> nop
+#0+00b4 <[^>]*> slt	at,a0,a1
+#0+00b8 <[^>]*> bnez	at,000000b8 <text_label\+0xb8>
+#[ 	]*b8: R_MIPS_PC16	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+00c8 <[^>]*> nop
+#0+00cc <[^>]*> slt	at,a0,a1
+#0+00d0 <[^>]*> bnezl	at,000000d0 <text_label\+0xd0>
+#[ 	]*d0: R_MIPS_PC16	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+00e0 <[^>]*> nop
 	...
diff --git a/gas/testsuite/gas/mips/blt.s b/gas/testsuite/gas/mips/blt.s
index 9b2ed08..cdeff16 100644
--- a/gas/testsuite/gas/mips/blt.s
+++ b/gas/testsuite/gas/mips/blt.s
@@ -25,10 +25,10 @@ text_label:
 	blel	$4,$5,text_label
 
 # Branch to an external label.
-	blt	$4,$5,external_label
-	ble	$4,$5,external_label
-	bltl	$4,$5,external_label
-	blel	$4,$5,external_label
+#	blt	$4,$5,external_label
+#	ble	$4,$5,external_label
+#	bltl	$4,$5,external_label
+#	blel	$4,$5,external_label
 
 # Round to a 16 byte boundary, for ease in testing multiple targets.
 	nop
diff --git a/gas/testsuite/gas/mips/bltu.d b/gas/testsuite/gas/mips/bltu.d
index f6fbfbb..5b14731 100644
--- a/gas/testsuite/gas/mips/bltu.d
+++ b/gas/testsuite/gas/mips/bltu.d
@@ -45,20 +45,20 @@ Disassembly of section .text:
 0+0090 <[^>]*> sltu	at,a1,a0
 0+0094 <[^>]*> beqzl	at,0+0000 <text_label>
 0+0098 <[^>]*> nop
-0+009c <[^>]*> sltu	at,a0,a1
-0+00a0 <[^>]*> bnez	at,000000a0 <text_label\+0xa0>
-[ 	]*a0: R_MIPS_PC16	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+00b0 <[^>]*> nop
-0+00b4 <[^>]*> sltu	at,a0,a1
-0+00b8 <[^>]*> bnezl	at,000000b8 <text_label\+0xb8>
-[ 	]*b8: R_MIPS_PC16	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+00c8 <[^>]*> nop
+#0+009c <[^>]*> sltu	at,a0,a1
+#0+00a0 <[^>]*> bnez	at,000000a0 <text_label\+0xa0>
+#[ 	]*a0: R_MIPS_PC16	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+00b0 <[^>]*> nop
+#0+00b4 <[^>]*> sltu	at,a0,a1
+#0+00b8 <[^>]*> bnezl	at,000000b8 <text_label\+0xb8>
+#[ 	]*b8: R_MIPS_PC16	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+00c8 <[^>]*> nop
 	...
diff --git a/gas/testsuite/gas/mips/bltu.s b/gas/testsuite/gas/mips/bltu.s
index 602b7b2..88034e8 100644
--- a/gas/testsuite/gas/mips/bltu.s
+++ b/gas/testsuite/gas/mips/bltu.s
@@ -23,10 +23,10 @@ text_label:
 	bleul	$4,$5,text_label
 
 # Branch to an external label.
-	bltu	$4,$5,external_label
-	bleu	$4,$5,external_label
-	bltul	$4,$5,external_label
-	bleul	$4,$5,external_label
+#	bltu	$4,$5,external_label
+#	bleu	$4,$5,external_label
+#	bltul	$4,$5,external_label
+#	bleul	$4,$5,external_label
 
 # Round to a 16 byte boundary, for ease in testing multiple targets.
 	nop
diff --git a/gas/testsuite/gas/mips/branch-misc-2.d b/gas/testsuite/gas/mips/branch-misc-2.d
deleted file mode 100644
index ca7549d..0000000
--- a/gas/testsuite/gas/mips/branch-misc-2.d
+++ /dev/null
@@ -1,33 +0,0 @@
-#objdump: -dr --prefix-addresses --show-raw-insn
-#name: MIPS branch-misc-2
-
-# Test the branches to global symbols in current file.
-
-.*: +file format .*mips.*
-
-Disassembly of section .text:
-	\.\.\.
-	\.\.\.
-	\.\.\.
-0+003c <[^>]*> 0411fffc 	bal	00000030 <g3\+0x8>
-[ 	]*3c: R_MIPS_PC16	g1
-0+0040 <[^>]*> 00000000 	nop
-0+0044 <[^>]*> 0411fffc 	bal	00000038 <g3\+0x10>
-[ 	]*44: R_MIPS_PC16	g2
-0+0048 <[^>]*> 00000000 	nop
-0+004c <[^>]*> 0411fffc 	bal	00000040 <x\+0x4>
-[ 	]*4c: R_MIPS_PC16	g3
-0+0050 <[^>]*> 00000000 	nop
-0+0054 <[^>]*> 0411fffc 	bal	00000048 <x\+0xc>
-[ 	]*54: R_MIPS_PC16	g4
-0+0058 <[^>]*> 00000000 	nop
-0+005c <[^>]*> 0411fffc 	bal	00000050 <x\+0x14>
-[ 	]*5c: R_MIPS_PC16	g5
-0+0060 <[^>]*> 00000000 	nop
-0+0064 <[^>]*> 0411fffc 	bal	00000058 <x\+0x1c>
-[ 	]*64: R_MIPS_PC16	g6
-0+0068 <[^>]*> 00000000 	nop
-	\.\.\.
-	\.\.\.
-	\.\.\.
-	\.\.\.
diff --git a/gas/testsuite/gas/mips/branch-misc-2.l b/gas/testsuite/gas/mips/branch-misc-2.l
new file mode 100644
index 0000000..a84068a
--- /dev/null
+++ b/gas/testsuite/gas/mips/branch-misc-2.l
@@ -0,0 +1,9 @@
+.*: Assembler messages:
+.*:21: Error: Can not represent BFD_RELOC_16_PCREL_S2 relocation in this object file format
+.*:22: Error: Can not represent BFD_RELOC_16_PCREL_S2 relocation in this object file format
+.*:23: Error: Can not represent BFD_RELOC_16_PCREL_S2 relocation in this object file format
+.*:24: Error: Can not represent BFD_RELOC_16_PCREL_S2 relocation in this object file format
+.*:25: Error: Can not represent BFD_RELOC_16_PCREL_S2 relocation in this object file format
+.*:26: Error: Can not represent BFD_RELOC_16_PCREL_S2 relocation in this object file format
+.*:35: Error: Can not represent BFD_RELOC_16_PCREL_S2 relocation in this object file format
+.*:36: Error: Can not represent BFD_RELOC_16_PCREL_S2 relocation in this object file format
diff --git a/gas/testsuite/gas/mips/branch-misc-2.s b/gas/testsuite/gas/mips/branch-misc-2.s
index e574922..8022e34 100644
--- a/gas/testsuite/gas/mips/branch-misc-2.s
+++ b/gas/testsuite/gas/mips/branch-misc-2.s
@@ -7,6 +7,8 @@
 	.globl g5 .text
 	.globl g6 .text
 
+	.globl x1 .text
+
 	.text
 g1:
 	.space 20
@@ -30,5 +32,8 @@ g5:
 	.space 20
 g6:
 
+	b	x1
+	b	x2
+
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
 	.space	8
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 2800db1..89437d8 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -57,7 +57,7 @@ if { [istarget mips*-*-*] } then {
     run_dump_test "blt"
     run_dump_test "bltu"
     run_dump_test "branch-misc-1"
-    run_dump_test "branch-misc-2"
+    run_list_test "branch-misc-2" ""
 
     if $ilocks {
 	run_dump_test "div-ilocks"