PATCH: Fix non-ELF ARM GAS test results

PATCH: Fix non-ELF ARM GAS test results

[Nick Clifton]

Hi Guys,

  I am applying the patch below to fix some unexpected failures in the
  GAS testsuite for non-ELF based ARM ports (arm-wince-pe, arm-epoc-pe).

Cheers
  Nick

gas/testsuite/ChangeLog
2010-10-22  Nick Clifton  <nickc@redhat.com>

	* gas/all/fwdexp.d: Also look for f8ffffff.
	* gas/arm/msr-reg-thumb.d: Skip for non-ELF based targets.
	* gas/arm/vldr.d: Likewise.
	* gas/arm/thumb2_ldmstm.d: Allow for extra NOPs at the end of the disassembly.
	* gas/cfi/cfi.exp (cfi-arm-1): Only run for ELF based ARM targets.

Index: gas/testsuite/gas/all/fwdexp.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/all/fwdexp.d,v
retrieving revision 1.1
diff -u -3 -p -r1.1 fwdexp.d
--- gas/testsuite/gas/all/fwdexp.d	29 Sep 2010 06:49:33 -0000	1.1
+++ gas/testsuite/gas/all/fwdexp.d	22 Oct 2010 08:08:01 -0000
@@ -8,4 +8,4 @@ OFFSET +TYPE +VALUE 
 0+ .*(\.data|i)(|\+0xf+e|\+0xf+c|\+0xf+8)
 
 Contents of section .*
- 0+ (0+|feff|fffe|fcffffff|fffffffc|f8ffffff ffffffff|ffffffff fffffff8) .*
+ 0+ (0+|feff|fffe|fcffffff|fffffffc|f8ffffff|f8ffffff ffffffff|ffffffff fffffff8) .*
Index: gas/testsuite/gas/arm/msr-reg-thumb.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/msr-reg-thumb.d,v
retrieving revision 1.1
diff -u -3 -p -r1.1 msr-reg-thumb.d
--- gas/testsuite/gas/arm/msr-reg-thumb.d	17 Sep 2010 10:42:04 -0000	1.1
+++ gas/testsuite/gas/arm/msr-reg-thumb.d	22 Oct 2010 08:08:02 -0000
@@ -2,6 +2,7 @@
 # as: -march=armv7-a -mthumb
 # source: msr-reg.s
 # objdump: -dr --prefix-addresses --show-raw-insn
+# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
 
 .*: +file format .*arm.*
 
Index: gas/testsuite/gas/arm/thumb2_ldmstm.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/thumb2_ldmstm.d,v
retrieving revision 1.3
diff -u -3 -p -r1.3 thumb2_ldmstm.d
--- gas/testsuite/gas/arm/thumb2_ldmstm.d	17 Sep 2010 15:19:14 -0000	1.3
+++ gas/testsuite/gas/arm/thumb2_ldmstm.d	22 Oct 2010 08:08:02 -0000
@@ -57,3 +57,4 @@ Disassembly of section .text:
 0[0-9a-f]+ <[^>]+> 9800      	ldr	r0, \[sp, #0\]
 0[0-9a-f]+ <[^>]+> f848 9b04 	str.w	r9, \[r8\], #4
 0[0-9a-f]+ <[^>]+> f8c8 9000 	str.w	r9, \[r8\]
+#pass
Index: gas/testsuite/gas/arm/vldr.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/vldr.d,v
retrieving revision 1.1
diff -u -3 -p -r1.1 vldr.d
--- gas/testsuite/gas/arm/vldr.d	27 Sep 2010 09:47:05 -0000	1.1
+++ gas/testsuite/gas/arm/vldr.d	22 Oct 2010 08:08:02 -0000
@@ -2,6 +2,7 @@
 # as: -mfpu=vfp3 -mcpu=cortex-a8 -mthumb
 # source: vldr.s
 # objdump: -dr --prefix-addresses --show-raw-insn
+# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
 
 .*: +file format .*arm.*
 
Index: gas/testsuite/gas/cfi/cfi.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cfi/cfi.exp,v
retrieving revision 1.24
diff -u -3 -p -r1.24 cfi.exp
--- gas/testsuite/gas/cfi/cfi.exp	2 Sep 2010 22:43:46 -0000	1.24
+++ gas/testsuite/gas/cfi/cfi.exp	22 Oct 2010 08:08:02 -0000
@@ -73,6 +73,10 @@ if  { [istarget "i*86-*-*"] || [istarget
     }
 
 } elseif { [istarget "arm*-*"] || [istarget "xscale*-*"] } then {
+    # Only ELF based ARM targets support CFI.
+    if { [is_pecoff_format] } then {
+	return
+    }
     run_dump_test "cfi-arm-1"
 
 } elseif { [istarget "mips*-*"] } then {