Fix unexpected failrues for arm toolchains

5 files changed, 28 insertions, 18 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 9cc46d9..077b7b6 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-04  Nick Clifton  <nickc@redhat.com>
+
+	* gas/arm/arm.exp: Fix test for running the "undefined" to catch
+	more non-ELF cases.
+	* gas/arm/pic.d: Fix for vxworks target.
+	* gas/arm/basic.d: Likewise.
+	* gas/arm/unwind.d: Likewise.
+
 2005-03-04  Richard Sandiford  <rsandifo@redhat.com>
 
 	* gas/mips/ldstla-{n32.s, n32.d, n32-shared.d}: Delete.
@@ -104,7 +112,6 @@
 	section.
 	* gas/arm/pic.d: Likewise.
 
->>>>>>> 1.791
 2005-03-01  Alan Modra  <amodra@bigpond.net.au>
 
 	* gas/m68k/mcf-emac.d: Allow for 64-bit addresses.
diff --git a/gas/testsuite/gas/arm/arm.exp b/gas/testsuite/gas/arm/arm.exp
index 8aa5c49..872e62b 100644
--- a/gas/testsuite/gas/arm/arm.exp
+++ b/gas/testsuite/gas/arm/arm.exp
@@ -57,15 +57,18 @@ if {[istarget *arm*-*-*] || [istarget "xscale-*-*"]} then {
     run_errors_test "armv1-bad" "-mcpu=arm7m" "ARM v1 errors"
     run_errors_test "r15-bad" "" "Invalid use of r15 errors"
 
-    if {[istarget *-*-*elf*] || [istarget *-*-linux*] || [istarget *-*-*eabi]} then {
+    if {[istarget *-*-*coff] || [istarget *-*-pe] || [istarget *-*-wince] ||
+        [istarget *-*-*aout*] || [istarget *-*-netbsd] || [istarget *-*-riscix*]} then {
+	# COFF and aout based ports use a different naming convention for local labels.
+       run_errors_test "undefined_coff" "" "Undefined local label error"
+   } else {
+       # For ELF based ports we can run some additional tests as well.
         run_errors_test "undefined" "" "Undefined local label error"
+       
 	run_dump_test "pic"
 	run_dump_test "mapping"
 	gas_test "bignum1.s" "" $stdoptlist "bignums"
 	run_dump_test "unwind"
-    } else {
-	# COFF based ports use a different naming convention for local labels.
-       run_errors_test "undefined_coff" "" "Undefined local label error"
     }
 
     if {! [istarget arm*-*-aout] && ![istarget arm-*-pe]} then {
diff --git a/gas/testsuite/gas/arm/inst.d b/gas/testsuite/gas/arm/inst.d
index 1b35684..3207732 100644
--- a/gas/testsuite/gas/arm/inst.d
+++ b/gas/testsuite/gas/arm/inst.d
@@ -159,13 +159,13 @@ Disassembly of section .text:
 0+254 <[^>]*> e9c40300 ?	stmib	r4, {r8, r9}\^
 0+258 <[^>]*> ef123456 ?	swi	0x00123456
 0+25c <[^>]*> 2f000033 ?	swics	0x00000033
-0+260 <[^>]*> ebfffffe ?	bl	0[0123456789abcdef]+ <[^>]*>
+0+260 <[^>]*> eb...... ?	bl	0[0123456789abcdef]+ <[^>]*>
 [		]*260:.*_wombat.*
-0+264 <[^>]*> 5bfffffe ?	blpl	0[0123456789abcdef]+ <[^>]*>
-[		]*264:.*ARM.*hohum
-0+268 <[^>]*> eafffffe ?	b	0[0123456789abcdef]+ <[^>]*>
+0+264 <[^>]*> 5b...... ?	blpl	0[0123456789abcdef]+ <[^>]*>
+[		]*264:.*ARM.*hohum.*
+0+268 <[^>]*> ea...... ?	b	0[0123456789abcdef]+ <[^>]*>
 [		]*268:.*_wibble.*
-0+26c <[^>]*> dafffffe ?	ble	0[0123456789abcdef]+ <[^>]*>
+0+26c <[^>]*> da...... ?	ble	0[0123456789abcdef]+ <[^>]*>
 [		]*26c:.*testerfunc.*
 0+270 <[^>]*> e1a01102 ?	mov	r1, r2, lsl #2
 0+274 <[^>]*> e1a01002 ?	mov	r1, r2
diff --git a/gas/testsuite/gas/arm/pic.d b/gas/testsuite/gas/arm/pic.d
index 5db6a61..b9dc4d9 100644
--- a/gas/testsuite/gas/arm/pic.d
+++ b/gas/testsuite/gas/arm/pic.d
@@ -6,8 +6,8 @@
 .*: +file format .*arm.*
 
 Disassembly of section .text:
-00+0 <[^>]*> ebfffffe 	bl	00+0 <[^>]*>
-			0: R_ARM_PC24	foo
+00+0 <[^>]*> eb...... 	bl	00+. <[^>]*>
+			0: R_ARM_PC24	foo.*
 00+4 <[^>]*> ebfffffe 	bl	0[0123456789abcdef]+ <[^>]*>
 			4: R_ARM_PLT32	foo
 	\.\.\.
diff --git a/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d
index 0ad5c39..3ca1626 100644
--- a/gas/testsuite/gas/arm/unwind.d
+++ b/gas/testsuite/gas/arm/unwind.d
@@ -14,13 +14,13 @@ OFFSET   TYPE              VALUE
 RELOCATION RECORDS FOR \[.ARM.exidx\]:
 OFFSET   TYPE              VALUE 
 00000000 R_ARM_PREL31      .text
-00000008 R_ARM_PREL31      .text
+00000008 R_ARM_PREL31      .text.*
 0000000c R_ARM_PREL31      .ARM.extab
-00000010 R_ARM_PREL31      .text
-00000014 R_ARM_PREL31      .ARM.extab
-00000018 R_ARM_PREL31      .text
-0000001c R_ARM_PREL31      .ARM.extab
-00000020 R_ARM_PREL31      .text
+00000010 R_ARM_PREL31      .text.*
+00000014 R_ARM_PREL31      .ARM.extab.*
+00000018 R_ARM_PREL31      .text.*
+0000001c R_ARM_PREL31      .ARM.extab.*
+00000020 R_ARM_PREL31      .text.*
 
 
 Contents of section .text: