* gas/arm/abs12.d: Update expected disassembly.

        * gas/arm/tls_vxworks.d: Likewise.
        * gas/arm/unwind_vxworks.d: Likewise.
        * gas/arm/group-reloc-alu-encoding-bad.d: Skip for vxworks
        targets.
        * gas/arm/group-reloc-alu.d: Likewise.
        * gas/arm/group-reloc-ldc-encoding-bad.d: Likewise.
        * gas/arm/group-reloc-ldc.d: Likewise.
        * gas/arm/group-reloc-ldr-encoding-bad.d: Likewise.
        * gas/arm/group-reloc-ldr.d: Likewise.
        * gas/arm/group-reloc-ldrs-encoding-bad.d: Likewise.
        * gas/arm/group-reloc-ldrs.d: Likewise.
        * gas/arm/local_function.d: Likewise.
        * gas/arm/mapshort-elf.d: Likewise.
        * gas/arm/undefined.d: Likewise.

15 files changed, 35 insertions, 17 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index f023ba9ca3..81ae42be46 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2008-09-05  Nick Clifton  <nickc@redhat.com>
+
+	* gas/arm/abs12.d: Update expected disassembly.
+	* gas/arm/tls_vxworks.d: Likewise.
+	* gas/arm/unwind_vxworks.d: Likewise.
+	* gas/arm/group-reloc-alu-encoding-bad.d: Skip for vxworks
+	targets.
+	* gas/arm/group-reloc-alu.d: Likewise.
+	* gas/arm/group-reloc-ldc-encoding-bad.d: Likewise.
+	* gas/arm/group-reloc-ldc.d: Likewise.
+	* gas/arm/group-reloc-ldr-encoding-bad.d: Likewise.
+	* gas/arm/group-reloc-ldr.d: Likewise.
+	* gas/arm/group-reloc-ldrs-encoding-bad.d: Likewise.
+	* gas/arm/group-reloc-ldrs.d: Likewise.
+	* gas/arm/local_function.d: Likewise.
+	* gas/arm/mapshort-elf.d: Likewise.
+	* gas/arm/undefined.d: Likewise.
+
 2008-09-04  Christian Groessler  <chris@groessler.org>
 
 	* lib/gas-defs.exp (run_dump_test): If the test expects an error,
diff --git a/gas/testsuite/gas/arm/abs12.d b/gas/testsuite/gas/arm/abs12.d
index 5d4bb3b35e..d1ccf967d8 100644
--- a/gas/testsuite/gas/arm/abs12.d
+++ b/gas/testsuite/gas/arm/abs12.d
@@ -5,7 +5,7 @@
 
 Disassembly of section \.text:
 
-00000000 <\.text>:
+00000000 <.*>:
    0:	e5910000 	ldr	r0, \[r1\]
 			0: R_ARM_ABS12	global
    4:	e5910000 	ldr	r0, \[r1\]
diff --git a/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
index e10a6a7589..bd46923096 100644
--- a/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, encoding failures (alu)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 #error-output: group-reloc-alu-encoding-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-alu.d b/gas/testsuite/gas/arm/group-reloc-alu.d
index 40e5025883..ba2c6a68ec 100644
--- a/gas/testsuite/gas/arm/group-reloc-alu.d
+++ b/gas/testsuite/gas/arm/group-reloc-alu.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 #name: Group relocation tests (alu)
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
index 52ee2e55b6..cdf0047d3b 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, encoding failures (ldc)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 #error-output: group-reloc-ldc-encoding-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc.d b/gas/testsuite/gas/arm/group-reloc-ldc.d
index 731a025f04..b1b3964547 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldc.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 #name: Group relocation tests (ldc)
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
index 49ba77478e..cfa0a0ccff 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, encoding failures (ldr)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 #error-output: group-reloc-ldr-encoding-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-ldr.d b/gas/testsuite/gas/arm/group-reloc-ldr.d
index cfc1b235cb..1c94bfcd16 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldr.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldr.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 #name: Group relocation tests (ldr)
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
index ff8babf8d5..0c0683a18f 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
@@ -1,3 +1,3 @@
 #name: Group relocation tests, encoding failures (ldrs)
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 #error-output: group-reloc-ldrs-encoding-bad.l
diff --git a/gas/testsuite/gas/arm/group-reloc-ldrs.d b/gas/testsuite/gas/arm/group-reloc-ldrs.d
index 9896f4bdb6..5c3d883a78 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldrs.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldrs.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 #name: Group relocation tests (ldrs)
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/local_function.d b/gas/testsuite/gas/arm/local_function.d
index 46da8eceb6..2532f739e3 100644
--- a/gas/testsuite/gas/arm/local_function.d
+++ b/gas/testsuite/gas/arm/local_function.d
@@ -1,7 +1,7 @@
 #objdump: -r
 #name: Relocations agains local function symbols
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 
 .*:     file format.*
 
diff --git a/gas/testsuite/gas/arm/mapshort-elf.d b/gas/testsuite/gas/arm/mapshort-elf.d
index e328b4ad63..9b20646d52 100644
--- a/gas/testsuite/gas/arm/mapshort-elf.d
+++ b/gas/testsuite/gas/arm/mapshort-elf.d
@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols for .short (ELF version)
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-*eabi *-*-syymbianelf *-*-linux-*
+#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-*eabi *-*-syymbianelf *-*-linux-* *-*-vxworks
 #source: mapshort.s
 
 # Test the generation and use of ARM ELF Mapping Symbols
diff --git a/gas/testsuite/gas/arm/tls_vxworks.d b/gas/testsuite/gas/arm/tls_vxworks.d
index ec80e652d2..6303a54b0c 100644
--- a/gas/testsuite/gas/arm/tls_vxworks.d
+++ b/gas/testsuite/gas/arm/tls_vxworks.d
@@ -16,15 +16,15 @@ Disassembly of section .text:
    0:	e1a00000 	nop			\(mov r0,r0\)
    4:	e1a00000 	nop			\(mov r0,r0\)
    8:	e1a0f00e 	mov	pc, lr
-   c:	00000000 	andeq	r0, r0, r0
+   c:	00000000 	.word	0x00000000
 			c: R_ARM_TLS_GD32	a
 # ??? The addend is appearing in both the RELA field and the
 # contents.  Shouldn't it be just one?  bfd_install_relocation
 # appears to write the addend into the contents unconditionally,
 # yet somehow this does not happen for the majority of relocations.
-  10:	00000004 	andeq	r0, r0, r4
+  10:	00000004 	.word	0x00000004
 			10: R_ARM_TLS_LDM32	b\+0x4
-  14:	00000008 	andeq	r0, r0, r8
+  14:	00000008 	.word	0x00000008
 			14: R_ARM_TLS_IE32	c\+0x8
-  18:	00000000 	andeq	r0, r0, r0
+  18:	00000000 	.word	0x00000000
 			18: R_ARM_TLS_LE32	d
diff --git a/gas/testsuite/gas/arm/undefined.d b/gas/testsuite/gas/arm/undefined.d
index e3e9bb0892..6c8bca7ded 100644
--- a/gas/testsuite/gas/arm/undefined.d
+++ b/gas/testsuite/gas/arm/undefined.d
@@ -1,5 +1,5 @@
 #name: Undefined local label error
 # COFF and aout based ports, except Windows CE, 
 # use a different naming convention for local labels.
-#skip: *-*-*coff *-unknown-pe *-epoc-pe *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-unknown-pe *-epoc-pe *-*-*aout* *-*-netbsd *-*-riscix* *-*-vxworks
 #error-output: undefined.l
diff --git a/gas/testsuite/gas/arm/unwind_vxworks.d b/gas/testsuite/gas/arm/unwind_vxworks.d
index 11817cf48c..bb3edff8b8 100644
--- a/gas/testsuite/gas/arm/unwind_vxworks.d
+++ b/gas/testsuite/gas/arm/unwind_vxworks.d
@@ -30,7 +30,7 @@ OFFSET   TYPE              VALUE
 
 Contents of section .text:
  0000 (0000a0e3 0100a0e3 0200a0e3 0300a0e3|e3a00000 e3a00001 e3a00002 e3a00003)  .*
- 0010 (04200520|20052004)                             .*
+ 0010 (04200520|20052004) .*
 Contents of section .ARM.extab:
  0000 (449b0181 b0b08086|81019b44 8680b0b0) 00000000 00000000  .*
  0010 (8402b101 b0b0b005 2a000000 00c60281|01b10284 05b0b0b0 0000002a 8102c600)  .*