From fab67a4c61fd555ee782676bf2273946771c6afe Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 28 Feb 2007 14:39:16 +0000 Subject: [PATCH] PR 3729: Fix unexpected failures in ARM GAS testsuite results. --- gas/testsuite/ChangeLog | 15 +++++++++++++++ gas/testsuite/gas/arm/arch7.d | 4 ++-- gas/testsuite/gas/arm/arm7t.d | 2 +- gas/testsuite/gas/arm/{mapshort.d => mapshort-eabi.d} | 8 +++++--- gas/testsuite/gas/arm/{mapshort.d => mapshort-elf.d} | 7 ++++--- gas/testsuite/gas/arm/neon-ldst-rm.d | 4 ++-- gas/testsuite/gas/arm/thumb2_pool.d | 2 ++ gas/testsuite/gas/arm/thumbrel.d | 4 ++-- gas/testsuite/gas/arm/wince_inst.d | 8 ++++---- gas/testsuite/gas/elf/section2.e-armeabi | 6 +++--- 10 files changed, 40 insertions(+), 20 deletions(-) copy gas/testsuite/gas/arm/{mapshort.d => mapshort-eabi.d} (82%) rename gas/testsuite/gas/arm/{mapshort.d => mapshort-elf.d} (86%) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index b48263f63..2702533cb 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,18 @@ +2007-02-28 Nick Clifton + + * gas/arm/mapshort.d: Split into two new files... + * gas/arm/mapshort-eabi.d: The one and... + * gas/arm/mapshort-elf.d: This one. + * gas/arm/arch7.d: Remove 32-bit host expectation. + * gas/arm/arm7t.d: Replace ".word 0x00000000" with ".*" as some + arm targets will disassemble this value as an instruction. + * gas/arm/neon-ldst-rm.d: Likewise. + * gas/arm/thumb2_pool.d: Only run this test for ELF based arm + ports. + * gas/arm/thumbrel.d: Only run this test for EABI based arm + ports. + * gas/arm/wince_inst.d: Fix expected branch targets. + 2007-02-22 DJ Delorie * gas/s390/esa-g5.s: Adjust for corrected PKA syntax. diff --git a/gas/testsuite/gas/arm/arch7.d b/gas/testsuite/gas/arm/arch7.d index f65634082..9cf73edf1 100644 --- a/gas/testsuite/gas/arm/arch7.d +++ b/gas/testsuite/gas/arm/arch7.d @@ -28,8 +28,8 @@ Disassembly of section .text: 0+050 <[^>]*> f995 f000 pli \[r5\] 0+054 <[^>]*> f995 ffff pli \[r5, #4095\] 0+058 <[^>]*> f915 fcff pli \[r5, #-255\] -0+05c <[^>]*> f99f ffff pli \[pc, #4095\] ; 0000105f <[^>]*> -0+060 <[^>]*> f91f ffff pli \[pc, #-4095\] ; fffff065 <[^>]*> +0+05c <[^>]*> f99f ffff pli \[pc, #4095\] ; 0+0105f <[^>]*> +0+060 <[^>]*> f91f ffff pli \[pc, #-4095\] ; f+ff065 <[^>]*> 0+064 <[^>]*> f3af 80f0 dbg #0 0+068 <[^>]*> f3af 80ff dbg #15 0+06c <[^>]*> f3bf 8f5f dmb sy diff --git a/gas/testsuite/gas/arm/arm7t.d b/gas/testsuite/gas/arm/arm7t.d index 655138853..754ae1d92 100644 --- a/gas/testsuite/gas/arm/arm7t.d +++ b/gas/testsuite/gas/arm/arm7t.d @@ -62,7 +62,7 @@ Disassembly of section .text: 0+d0 <[^>]*> b19100d2 ? ldrltsb r0, \[r1, r2\] 0+d4 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] ; 0+e0 <[^>]*> 0+d8 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] ; 0+e4 <[^>]*> -0+dc <[^>]*> 00000000 ? .word 0x00000000 +0+dc <[^>]*> 00000000 ? .* [ ]*dc:.*fred 0+e0 <[^>]*> 0000c0de ? .* 0+e4 <[^>]*> 0000dead ? .* diff --git a/gas/testsuite/gas/arm/mapshort.d b/gas/testsuite/gas/arm/mapshort-eabi.d similarity index 82% copy from gas/testsuite/gas/arm/mapshort.d copy to gas/testsuite/gas/arm/mapshort-eabi.d index d5b5793b7..eac8b967b 100644 --- a/gas/testsuite/gas/arm/mapshort.d +++ b/gas/testsuite/gas/arm/mapshort-eabi.d @@ -1,7 +1,8 @@ #objdump: --syms --special-syms -d -#name: ARM Mapping Symbols for .short -# This test is only valid on ELF based ports. -#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* +#name: ARM Mapping Symbols for .short (EABI version) +# This test is only valid on EABI based ports. +#target: *-*-*eabi *-*-symbianelf +#source: mapshort.s # Test the generation and use of ARM ELF Mapping Symbols @@ -20,6 +21,7 @@ SYMBOL TABLE: 0+18 l .text 00000000 \$a 0+1c l .text 00000000 \$d 0+1f l .text 00000000 bar +0+00 l d .ARM.attributes 00000000 .ARM.attributes Disassembly of section .text: diff --git a/gas/testsuite/gas/arm/mapshort.d b/gas/testsuite/gas/arm/mapshort-elf.d similarity index 86% rename from gas/testsuite/gas/arm/mapshort.d rename to gas/testsuite/gas/arm/mapshort-elf.d index d5b5793b7..d4552311e 100644 --- a/gas/testsuite/gas/arm/mapshort.d +++ b/gas/testsuite/gas/arm/mapshort-elf.d @@ -1,7 +1,8 @@ #objdump: --syms --special-syms -d -#name: ARM Mapping Symbols for .short +#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* +#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-*eabi *-*-syymbianelf +#source: mapshort.s # Test the generation and use of ARM ELF Mapping Symbols @@ -20,7 +21,7 @@ SYMBOL TABLE: 0+18 l .text 00000000 \$a 0+1c l .text 00000000 \$d 0+1f l .text 00000000 bar - +# The ELF based port does not generate a .ARM.attributes symbol Disassembly of section .text: diff --git a/gas/testsuite/gas/arm/neon-ldst-rm.d b/gas/testsuite/gas/arm/neon-ldst-rm.d index 292d17a6a..86285d6dc 100644 --- a/gas/testsuite/gas/arm/neon-ldst-rm.d +++ b/gas/testsuite/gas/arm/neon-ldst-rm.d @@ -45,7 +45,7 @@ Disassembly of section \.text: 0[0-9a-f]+ <[^>]+> ed224b08 vstmdb r2!, {d4-d7} 0[0-9a-f]+ <[^>]+> ed628b10 vstmdb r2!, {d24-d31} 0[0-9a-f]+ <[^>]+> ed223b20 vstmdb r2!, {d3-d18} -0[0-9a-f]+ 000001f4 .word 0x000001f4 +0[0-9a-f]+ 000001f4 .* 0[0-9a-f]+ <[^>]+> eddf6b0b vldr d22, \[pc, #44\] ; 0[0-9a-f]+ 0[0-9a-f]+ <[^>]+> ed935b00 vldr d5, \[r3\] 0[0-9a-f]+ <[^>]+> ed135b01 vldr d5, \[r3, #-4\] @@ -59,5 +59,5 @@ Disassembly of section \.text: 0[0-9a-f]+ <[^>]+> ed835b00 vstr d5, \[r3\] 0[0-9a-f]+ <[^>]+> ed035b40 vstr d5, \[r3, #-256\] 0[0-9a-f]+ <[^>]+> ed835b40 vstr d5, \[r3, #256\] -0[0-9a-f]+ 000002bc .word 0x000002bc +0[0-9a-f]+ 000002bc .* 0[0-9a-f]+ <[^>]+> ed1f7b11 vldr d7, \[pc, #-68\] ; 0[0-9a-f]+ diff --git a/gas/testsuite/gas/arm/thumb2_pool.d b/gas/testsuite/gas/arm/thumb2_pool.d index 3e3ca59e1..752da7fb6 100644 --- a/gas/testsuite/gas/arm/thumb2_pool.d +++ b/gas/testsuite/gas/arm/thumb2_pool.d @@ -1,5 +1,7 @@ # as: -march=armv6t2 # objdump: -dr --prefix-addresses --show-raw-insn +# This test is only valid on ELF based ports. +#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* .*: +file format .*arm.* diff --git a/gas/testsuite/gas/arm/thumbrel.d b/gas/testsuite/gas/arm/thumbrel.d index 495360fe7..fff41af9c 100644 --- a/gas/testsuite/gas/arm/thumbrel.d +++ b/gas/testsuite/gas/arm/thumbrel.d @@ -1,6 +1,6 @@ #objdump: -sr -# This test is only valid on ELF based ports. -#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* +# This test is only valid on EABI based ports. +#target: *-*-*eabi *-*-symbianelf .*: file format.* diff --git a/gas/testsuite/gas/arm/wince_inst.d b/gas/testsuite/gas/arm/wince_inst.d index a9852e039..856691480 100644 --- a/gas/testsuite/gas/arm/wince_inst.d +++ b/gas/testsuite/gas/arm/wince_inst.d @@ -163,13 +163,13 @@ Disassembly of section .text: 0+254 <[^>]*> e9c40300 ? stmib r4, {r8, r9}\^ 0+258 <[^>]*> ef123456 ? (swi|svc) 0x00123456 0+25c <[^>]*> 2f000033 ? (swi|svc)cs 0x00000033 -0+260 <[^>]*> eb000000 ? bl 0+268 <[^>]*> +0+260 <[^>]*> eb000000 ? bl 0.* <[^>]*> [ ]*260:.*_wombat.* -0+264 <[^>]*> 5b000000 ? blpl 0+26c <[^>]*> +0+264 <[^>]*> 5b000000 ? blpl 0.* <[^>]*> [ ]*264:.*ARM.*hohum -0+268 <[^>]*> ea000000 ? b 0+270 <[^>]*> +0+268 <[^>]*> ea000000 ? b 0.* <[^>]*> [ ]*268:.*_wibble.* -0+26c <[^>]*> da000000 ? ble 0+274 <[^>]*> +0+26c <[^>]*> da000000 ? ble 0.* <[^>]*> [ ]*26c:.*testerfunc.* 0+270 <[^>]*> e1a01102 ? mov r1, r2, lsl #2 0+274 <[^>]*> e1a01002 ? mov r1, r2 diff --git a/gas/testsuite/gas/elf/section2.e-armeabi b/gas/testsuite/gas/elf/section2.e-armeabi index 13a152584..44ecffc37 100644 --- a/gas/testsuite/gas/elf/section2.e-armeabi +++ b/gas/testsuite/gas/elf/section2.e-armeabi @@ -1,10 +1,10 @@ -Symbol table '.symtab' contains 6 entries: +Symbol table '.symtab' contains 7 entries: Num: Value[ ]* Size Type Bind Vis Ndx Name 0: 0+0 0 NOTYPE LOCAL DEFAULT UND 1: 0+0 0 SECTION LOCAL DEFAULT 1 2: 0+0 0 SECTION LOCAL DEFAULT 2 3: 0+0 0 SECTION LOCAL DEFAULT 3 4: 0+0 0 SECTION LOCAL DEFAULT 4 - 5: 0+0 0 SECTION LOCAL DEFAULT 5 - 6: 0+0 0 NOTYPE LOCAL DEFAULT 4 \$d + 5: 0+0 0 NOTYPE LOCAL DEFAULT 4 \$d + 6: 0+0 0 SECTION LOCAL DEFAULT 5 -- 2.11.4.GIT