From c7c3f80e9ccc436c6061f1c85b7ca9450fa5d3aa Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 2 Nov 2013 15:31:16 +1030 Subject: [PATCH] Assorted x86 testsuite fixes. I think HJ has already fixed the binutils and ld tests with his 2013-09-27 readelf change, but this allows them to pass with wider address output as per Nick's 2013-09-12 readelf change. binutils/testsuite/ * binutils-all/x86-64/compressed-1a.d: Allow wide display of addresses. gas/testsuite/ * gas/cfi/cfi-x86_64.d: Match when lacking end of section padding. ld/testsuite/ * ld-pe/cfi.d: Allow wide display of addresses. --- binutils/testsuite/ChangeLog | 2 ++ binutils/testsuite/binutils-all/x86-64/compressed-1a.d | 6 +++--- gas/testsuite/ChangeLog | 5 ++++- gas/testsuite/gas/cfi/cfi-x86_64.d | 4 ---- ld/testsuite/ChangeLog | 4 ++++ ld/testsuite/ld-pe/cfi.d | 6 +++--- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index e11fbe16041..94f0ce4efc9 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,5 +1,7 @@ 2013-11-02 Alan Modra + * binutils-all/x86-64/compressed-1a.d: Allow wide display of addresses. + * binutils-all/dw2-1.S: Use .4byte rather than .int. * binutils-all/dw2-2.S: Likewise. diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d index f1e4bbcd88f..19471ab629a 100644 --- a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d +++ b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d @@ -135,7 +135,7 @@ Contents of the .[z]?debug_str section: Contents of the .[z]?debug_frame section: -00000000 0+014 ffffffff CIE +0+ 0+14 0*ffffffff CIE Version: 1 Augmentation: "" Code alignment factor: 1 @@ -151,7 +151,7 @@ Contents of the .[z]?debug_frame section: DW_CFA_nop DW_CFA_nop -00000018 0+014 00000000 FDE cie=00000000 pc=0+0000..0+0002 +0+18 0+14 0+ FDE cie=0+ pc=0+..0+2 -00000030 0+014 00000000 FDE cie=00000000 pc=0+0010..0+0015 +0+30 0+14 0+ FDE cie=0+ pc=0+10..0+15 diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index f7cd11975fc..9694b8afab3 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2013-11-02 Alan Modra + + * gas/cfi/cfi-x86_64.d: Match when lacking end of section padding. + 2013-10-29 Jan Beulich * gas/microblaze/relax_size.elf: Drop expectation of no longer @@ -611,7 +615,6 @@ 2013-05-31 Catherine Moore - gas/testsuite/ * gas/mips/ehword.d: New. * gas/mips/ehword.s: New. * gas/mips/mips.exp: Run ehword test. diff --git a/gas/testsuite/gas/cfi/cfi-x86_64.d b/gas/testsuite/gas/cfi/cfi-x86_64.d index 592416aee4b..900a5e5248f 100644 --- a/gas/testsuite/gas/cfi/cfi-x86_64.d +++ b/gas/testsuite/gas/cfi/cfi-x86_64.d @@ -269,8 +269,4 @@ Contents of the .eh_frame section: DW_CFA_advance_loc: 1 to 0+00ae DW_CFA_undefined: r125 \(k7\) DW_CFA_nop - DW_CFA_nop - DW_CFA_nop - DW_CFA_nop - DW_CFA_nop #pass diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index cacaeaab6e0..369333aced6 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2013-11-02 Alan Modra + + * ld-pe/cfi.d: Allow wide display of addresses. + 2013-11-01 Roland McGrath * ld-x86-64/plt-nacl.pd: Update expected disassembly for PLT nop fix. diff --git a/ld/testsuite/ld-pe/cfi.d b/ld/testsuite/ld-pe/cfi.d index 6c5042bdd8b..55ebaca1aef 100644 --- a/ld/testsuite/ld-pe/cfi.d +++ b/ld/testsuite/ld-pe/cfi.d @@ -4,7 +4,7 @@ #objdump: -Wf #... -00000004 00000014 ffffffff CIE +0+4 0+14 0*ffffffff CIE Version: 1 Augmentation: "" Code alignment factor: 1 @@ -20,12 +20,12 @@ DW_CFA_nop DW_CFA_nop -0000001c 00000024 00000004 FDE cie=00000004 pc=.* +0+1c 0+24 0+4 FDE cie=0+4 pc=.* DW_CFA_advance_loc: 4 to .* DW_CFA_def_cfa_offset: 16 DW_CFA_offset: r6 \(rbp\) at cfa\-16 DW_CFA_advance_loc: 4 to .* -^ DW_CFA_def_cfa: r7 \(rsp\) ofs 8 + DW_CFA_def_cfa: r7 \(rsp\) ofs 8 DW_CFA_restore: r6 \(rbp\) DW_CFA_nop DW_CFA_nop -- 2.30.2