From 87c119b0c366f4a7388d4f52a95761a9a016f659 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 22 Oct 2010 08:13:59 +0000 Subject: [PATCH] * 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. --- gas/testsuite/ChangeLog | 8 ++++++++ gas/testsuite/gas/all/fwdexp.d | 2 +- gas/testsuite/gas/arm/msr-reg-thumb.d | 1 + gas/testsuite/gas/arm/thumb2_ldmstm.d | 1 + gas/testsuite/gas/arm/vldr.d | 1 + gas/testsuite/gas/cfi/cfi.exp | 4 ++++ 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 06bc027b148..f980f33896d 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-10-22 Nick Clifton + + * 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. + 2010-10-21 Joseph Myers * gas/tic6x/attr-arch-directive-1.d, diff --git a/gas/testsuite/gas/all/fwdexp.d b/gas/testsuite/gas/all/fwdexp.d index b30e350b160..222dab2c494 100644 --- a/gas/testsuite/gas/all/fwdexp.d +++ b/gas/testsuite/gas/all/fwdexp.d @@ -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) .* diff --git a/gas/testsuite/gas/arm/msr-reg-thumb.d b/gas/testsuite/gas/arm/msr-reg-thumb.d index 0c92e567f21..e449af1eceb 100644 --- a/gas/testsuite/gas/arm/msr-reg-thumb.d +++ b/gas/testsuite/gas/arm/msr-reg-thumb.d @@ -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.* diff --git a/gas/testsuite/gas/arm/thumb2_ldmstm.d b/gas/testsuite/gas/arm/thumb2_ldmstm.d index f89bf16812f..3ab53ac67ed 100644 --- a/gas/testsuite/gas/arm/thumb2_ldmstm.d +++ b/gas/testsuite/gas/arm/thumb2_ldmstm.d @@ -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 diff --git a/gas/testsuite/gas/arm/vldr.d b/gas/testsuite/gas/arm/vldr.d index d5c93316671..fbb1560232e 100644 --- a/gas/testsuite/gas/arm/vldr.d +++ b/gas/testsuite/gas/arm/vldr.d @@ -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.* diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp index 1999db62864..7642e01a27c 100644 --- a/gas/testsuite/gas/cfi/cfi.exp +++ b/gas/testsuite/gas/cfi/cfi.exp @@ -73,6 +73,10 @@ if { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then { } } 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 { -- 2.30.2