Fix test results for arm-pe toolchain

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 350a9420a380fe8b292fc0c5fea700b5ff69de64..4a8f87f415bf60ad35e7a5bcb5b91021281562ad 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+1999-11-01  Nick Clifton  <nickc@cygnus.com>
+
+       Remove reloc generating references to local labels in test code.
+       Some ARM targets (eg PE) generate a reloc based on the label,
+       whilst others (eg ELF) generate a reloc based on the section
+       symbol.  This meant that the disassembled outputs would differ.
+       
+       * gas/arm/inst.s: Change test of BLPL instruction.
+       * gas/arm/inst.d: Change expected decode of BLPL instruction.
+       * gas/arm/arm7t.s: Remove use of .LC0 label in .word directive.
+
 1999-10-21  Nick Clifton  <nickc@cygnus.com>
 
        * gas/arm/arm7t.d: Update to match latest objdump output.

diff --git a/gas/testsuite/gas/arm/arm7t.s b/gas/testsuite/gas/arm/arm7t.s
index 656e90e0330ca4120df5c90378e6cca68621643e..061eb2b43ff3b0262c3e10d21059f66aff0b6c5a 100644 (file)
--- a/gas/testsuite/gas/arm/arm7t.s
+++ b/gas/testsuite/gas/arm/arm7t.s
@@ -1,6 +1,5 @@
        .section        .rdata
        .align  0
-.LC0:
        .ascii  "some data\000"
 
        .text
@@ -76,4 +75,4 @@ misc:
 
        .align
 .L2:
-       .word   .LC0
+       .word   .rdata

diff --git a/gas/testsuite/gas/arm/inst.d b/gas/testsuite/gas/arm/inst.d
index 8fc0ecf10ea6db010b289d25c011cce75ecd4bdc..9566adb60690f980142368d8b9f9cd84c9982ceb 100644 (file)
--- a/gas/testsuite/gas/arm/inst.d
+++ b/gas/testsuite/gas/arm/inst.d
@@ -161,8 +161,8 @@ Disassembly of section .text:
 0000025c <[^>]*> 2f000033 ?    swics   0x00000033
 00000260 <[^>]*> ebfffffe ?    bl      00000260 <[^>]*>
 [              ]*260:.*_wombat.*
-00000264 <[^>]*> 5b000082 ?    blpl    00000474 <[^>]*>
-                       264: R_ARM_PC24 \.text
+00000264 <[^>]*> 5bfffffe ?    blpl    00000264 <[^>]*>
+[              ]*264:.*ARM.*hohum
 00000268 <[^>]*> eafffffe ?    b       00000268 <[^>]*>
 [              ]*268:.*_wibble.*
 0000026c <[^>]*> dafffffe ?    ble     0000026c <[^>]*>

diff --git a/gas/testsuite/gas/arm/inst.s b/gas/testsuite/gas/arm/inst.s
index 7e172b9ba571f5d8c203d096a7bd84b60b809979..c603755dcba5ebf87bdb620cc374527d6cf34541 100644 (file)
--- a/gas/testsuite/gas/arm/inst.s
+++ b/gas/testsuite/gas/arm/inst.s
@@ -184,6 +184,6 @@ bar:
        swihs   0x33
 
        bl      _wombat
-       blpl    bar
+       blpl    hohum
        b       _wibble
        ble     testerfunc