Update to match current gas,bfd and opcodes.

3 files changed, 18 insertions, 12 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6d017bc72e..67b7a7fdd2 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-03  Philip Blundell  <philb@gnu.org>
+
+	* gas/arm/arm7t.d, gas/arm/inst.d: Update to match current gas,
+ 	bfd and opcodes.
+
 1999-05-28  Ian Lance Taylor  <ian@zembu.com>
 
 	* gas/vtable/vtable.exp: Don't run test for i960 yet.
diff --git a/gas/testsuite/gas/arm/arm7t.d b/gas/testsuite/gas/arm/arm7t.d
index 143a161cd2..9c4c83adcb 100644
--- a/gas/testsuite/gas/arm/arm7t.d
+++ b/gas/testsuite/gas/arm/arm7t.d
@@ -16,8 +16,8 @@ Disassembly of section .text:
 00000018 <[^>]*> e15100bc ?	ldrh	r0, \[r1, -#12\]
 0000001c <[^>]*> e09100b2 ?	ldrh	r0, \[r1\], r2
 00000020 <[^>]*> e3a00cff ?	mov	r0, #65280
-00000024 <[^>]*> e1df0bb4 ?	ldrh	r0, 000000e0 <\$\$lit_1>
-00000028 <[^>]*> e1df0abc ?	ldrh	r0, 000000dc <.L2>
+00000024 <[^>]*> e1df0bb4 ?	ldrh	r0, \[pc, #b4\]	; 000000e0 <[^>]*>
+00000028 <[^>]*> e1df0abc ?	ldrh	r0, \[pc, #ac\]	; 000000dc <[^>]*>
 0000002c <[^>]*> e1c100b0 ?	strh	r0, \[r1\]
 00000030 <[^>]*> e1e100b0 ?	strh	r0, \[r1\]!
 00000034 <[^>]*> e18100b2 ?	strh	r0, \[r1, r2\]
@@ -26,7 +26,7 @@ Disassembly of section .text:
 00000040 <[^>]*> e1e100bc ?	strh	r0, \[r1, #12\]!
 00000044 <[^>]*> e14100bc ?	strh	r0, \[r1, -#12\]
 00000048 <[^>]*> e08100b2 ?	strh	r0, \[r1\], r2
-0000004c <[^>]*> e1cf08b8 ?	strh	r0, 000000dc <.L2>
+0000004c <[^>]*> e1cf08b8 ?	strh	r0, \[pc, #88\]	; 000000dc <[^>]*>
 00000050 <[^>]*> e1d100d0 ?	ldrsb	r0, \[r1\]
 00000054 <[^>]*> e1f100d0 ?	ldrsb	r0, \[r1\]!
 00000058 <[^>]*> e19100d2 ?	ldrsb	r0, \[r1, r2\]
@@ -36,7 +36,7 @@ Disassembly of section .text:
 00000068 <[^>]*> e15100dc ?	ldrsb	r0, \[r1, -#12\]
 0000006c <[^>]*> e09100d2 ?	ldrsb	r0, \[r1\], r2
 00000070 <[^>]*> e3a000de ?	mov	r0, #222
-00000074 <[^>]*> e1df06d0 ?	ldrsb	r0, 000000dc <.L2>
+00000074 <[^>]*> e1df06d0 ?	ldrsb	r0, \[pc, #60\]	; 000000dc <[^>]*>
 00000078 <[^>]*> e1d100f0 ?	ldrsh	r0, \[r1\]
 0000007c <[^>]*> e1f100f0 ?	ldrsh	r0, \[r1\]!
 00000080 <[^>]*> e19100f2 ?	ldrsh	r0, \[r1, r2\]
@@ -46,8 +46,8 @@ Disassembly of section .text:
 00000090 <[^>]*> e15100fc ?	ldrsh	r0, \[r1, -#12\]
 00000094 <[^>]*> e09100f2 ?	ldrsh	r0, \[r1\], r2
 00000098 <[^>]*> e3a00cff ?	mov	r0, #65280
-0000009c <[^>]*> e1df03fc ?	ldrsh	r0, 000000e0 <\$\$lit_1>
-000000a0 <[^>]*> e1df03f4 ?	ldrsh	r0, 000000dc <.L2>
+0000009c <[^>]*> e1df03fc ?	ldrsh	r0, \[pc, #3c\]	; 000000e0 <[^>]*>
+000000a0 <[^>]*> e1df03f4 ?	ldrsh	r0, \[pc, #34\]	; 000000dc <[^>]*>
 000000a4 <[^>]*> e19100b2 ?	ldrh	r0, \[r1, r2\]
 000000a8 <[^>]*> 119100b2 ?	ldrneh	r0, \[r1, r2\]
 000000ac <[^>]*> 819100b2 ?	ldrhih	r0, \[r1, r2\]
@@ -60,9 +60,9 @@ Disassembly of section .text:
 000000c8 <[^>]*> 119100d2 ?	ldrnesb	r0, \[r1, r2\]
 000000cc <[^>]*> 819100d2 ?	ldrhisb	r0, \[r1, r2\]
 000000d0 <[^>]*> b19100d2 ?	ldrltsb	r0, \[r1, r2\]
-000000d4 <[^>]*> e1df00f4 ?	ldrsh	r0, 000000e0 <\$\$lit_1>
-000000d8 <[^>]*> e1df00f4 ?	ldrsh	r0, 000000e4 <\$\$lit_1\+0x4>
+000000d4 <[^>]*> e1df00f4 ?	ldrsh	r0, \[pc, #4\]	; 000000e0 <[^>]*>
+000000d8 <[^>]*> e1df00f4 ?	ldrsh	r0, \[pc, #4\]	; 000000e4 <[^>]*>
 000000dc <[^>]*> 00000000 ?	andeq	r0, r0, r0
-[		]*dc:.*.LC0
+[		]*dc:.*.rdata
 000000e0 <[^>]*> 0000c0de ?	.*
 000000e4 <[^>]*> 0000dead ?	.*
diff --git a/gas/testsuite/gas/arm/inst.d b/gas/testsuite/gas/arm/inst.d
index decb8f01b7..53cfaf9984 100644
--- a/gas/testsuite/gas/arm/inst.d
+++ b/gas/testsuite/gas/arm/inst.d
@@ -126,7 +126,7 @@ Disassembly of section .text:
 000001d0 <[^>]*> 14954006 ?	ldrne	r4, \[r5\], #6
 000001d4 <[^>]*> e6b21003 ?	ldrt	r1, \[r2\], r3
 000001d8 <[^>]*> e6942425 ?	ldr	r2, \[r4\], r5, lsr #8
-000001dc <[^>]*> e51f0008 ?	ldr	r0, 000001dc <[^>]*>
+000001dc <[^>]*> e51f0008 ?	ldr	r0, \[pc, #fffffff8\]	; 000001dc <[^>]*>
 000001e0 <[^>]*> e5d43000 ?	ldrb	r3, \[r4\]
 000001e4 <[^>]*> 14f85000 ?	ldrnebt	r5, \[r8\]
 000001e8 <[^>]*> e5810000 ?	str	r0, \[r1\]
@@ -138,7 +138,7 @@ Disassembly of section .text:
 00000200 <[^>]*> 14854006 ?	strne	r4, \[r5\], #6
 00000204 <[^>]*> e6821003 ?	str	r1, \[r2\], r3
 00000208 <[^>]*> e6a42425 ?	strt	r2, \[r4\], r5, lsr #8
-0000020c <[^>]*> e50f1004 ?	str	r1, 00000210 <[^>]*>
+0000020c <[^>]*> e50f1004 ?	str	r1, \[pc, #fffffffc\]	; 00000210 <[^>]*>
 00000210 <[^>]*> e5c71000 ?	strb	r1, \[r7\]
 00000214 <[^>]*> e4e02000 ?	strbt	r2, \[r0\]
 00000218 <[^>]*> e8900002 ?	ldmia	r0, {r1}
@@ -161,7 +161,8 @@ Disassembly of section .text:
 0000025c <[^>]*> 2f000033 ?	swics	0x00000033
 00000260 <[^>]*> ebfffffe ?	bl	00000260 <[^>]*>
 [		]*260:.*_wombat.*
-00000264 <[^>]*> 5bffffe9 ?	blpl	00000210 <bar>
+00000264 <[^>]*> 5b000082 ?	blpl	00000474 <[^>]*>
+			264: R_ARM_PC24	\.text
 00000268 <[^>]*> eafffffe ?	b	00000268 <[^>]*>
 [		]*268:.*_wibble.*
 0000026c <[^>]*> dafffffe ?	ble	0000026c <[^>]*>