From 1ab84e0251a593bec32ccec9fef72b53b4ce218d Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 8 Jun 2020 08:39:23 +0200 Subject: [PATCH] ix86: enable 2nd CFI test While putting together the previous patch I noticed that this test, forever since its introduction, was dead. Update it so it will pass, and enable it. --- gas/ChangeLog | 5 +++++ gas/testsuite/gas/cfi/cfi-i386-2.d | 14 +++++++------- gas/testsuite/gas/cfi/cfi.exp | 1 + 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 787c0fd44ed..abc0869d10a 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2020-06-08 Jan Beulich + + * testsuite/gas/cfi/cfi-i386-2.d: Adjust expectations. + * testsuite/gas/cfi/cfi.exp: Run this test. + 2020-06-08 Jan Beulich * config/tc-i386.c (parse_real_register): Add allow_pseudo_reg diff --git a/gas/testsuite/gas/cfi/cfi-i386-2.d b/gas/testsuite/gas/cfi/cfi-i386-2.d index 2161b01ccd7..05e414d93ea 100644 --- a/gas/testsuite/gas/cfi/cfi-i386-2.d +++ b/gas/testsuite/gas/cfi/cfi-i386-2.d @@ -10,17 +10,17 @@ Contents of the .eh_frame section: Return address column: 8 Augmentation data: 1b - DW_CFA_def_cfa: r4 ofs 4 - DW_CFA_offset: r8 at cfa-4 + DW_CFA_def_cfa: r4 \(esp\) ofs 4 + DW_CFA_offset: r8 \(eip\) at cfa-4 DW_CFA_nop DW_CFA_nop -00000018 0+0018 0+001c FDE cie=0+0000 pc=0+0020..0+0029 - DW_CFA_advance_loc: 1 to 0+0021 +00000018 0+0018 0+001c FDE cie=0+0000 pc=0+0000..0+0009 + DW_CFA_advance_loc: 1 to 0+0001 DW_CFA_def_cfa_offset: 8 - DW_CFA_offset: r5 at cfa-8 - DW_CFA_advance_loc: 4 to 0+0025 - DW_CFA_offset: r3 at cfa-12 + DW_CFA_offset: r5 \(ebp\) at cfa-8 + DW_CFA_advance_loc: 4 to 0+0005 + DW_CFA_offset: r3 \(ebx\) at cfa-12 DW_CFA_def_cfa_offset: 12 DW_CFA_nop diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp index bbb1c159873..afafd7a0de4 100644 --- a/gas/testsuite/gas/cfi/cfi.exp +++ b/gas/testsuite/gas/cfi/cfi.exp @@ -48,6 +48,7 @@ if { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then { if { [gas_x86_32_check] } then { set ASFLAGS "$ASFLAGS --32" run_dump_test "cfi-i386" + run_dump_test "cfi-i386-2" set ASFLAGS "$old_ASFLAGS" } -- 2.39.2