From 969b385b5f7fddb1785b1f5d90de290aa264b1ee Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Mon, 10 Oct 2016 14:06:35 +0200 Subject: [PATCH] MIPS64: Adjust cfi* testcases. The CFI* testcases fail on MIPS64 because the augmentation string does not match the regexp. This is because MIPS64 doesn't use the default of 4 for DWARF2_FDE_RELOC_SIZE which ends up as "b" in the augmentation string. MIPS64 uses the address size which is 8 resulting in "c". Adding c to the regexp fixes a couple of them. Others also need adjustments in the FDE header lines due to different sizes/offsets. gas/ChangeLog: 2016-10-10 Andreas Krebbel * testsuite/gas/cfi/cfi-common-1.d: Adjust regexps for mips64. * testsuite/gas/cfi/cfi-common-2.d: Likewise. * testsuite/gas/cfi/cfi-common-3.d: Likewise. * testsuite/gas/cfi/cfi-common-4.d: Likewise. * testsuite/gas/cfi/cfi-common-5.d: Likewise. * testsuite/gas/cfi/cfi-common-7.d: Likewise. * testsuite/gas/cfi/cfi-common-8.d: Likewise. * testsuite/gas/cfi/cfi-common-9.d: Likewise. * testsuite/gas/cfi/cfi-mips-1.d: Likewise. --- gas/ChangeLog | 12 ++++++++++++ gas/testsuite/gas/cfi/cfi-common-1.d | 2 +- gas/testsuite/gas/cfi/cfi-common-2.d | 4 ++-- gas/testsuite/gas/cfi/cfi-common-3.d | 4 ++-- gas/testsuite/gas/cfi/cfi-common-4.d | 6 +++--- gas/testsuite/gas/cfi/cfi-common-5.d | 6 +++--- gas/testsuite/gas/cfi/cfi-common-7.d | 4 ++-- gas/testsuite/gas/cfi/cfi-common-8.d | 2 +- gas/testsuite/gas/cfi/cfi-common-9.d | 2 +- gas/testsuite/gas/cfi/cfi-mips-1.d | 4 ++-- 10 files changed, 29 insertions(+), 17 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 37951017dbb..4ecacf42757 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,15 @@ +2016-10-10 Andreas Krebbel + + * testsuite/gas/cfi/cfi-common-1.d: Adjust regexps for mips64. + * testsuite/gas/cfi/cfi-common-2.d: Likewise. + * testsuite/gas/cfi/cfi-common-3.d: Likewise. + * testsuite/gas/cfi/cfi-common-4.d: Likewise. + * testsuite/gas/cfi/cfi-common-5.d: Likewise. + * testsuite/gas/cfi/cfi-common-7.d: Likewise. + * testsuite/gas/cfi/cfi-common-8.d: Likewise. + * testsuite/gas/cfi/cfi-common-9.d: Likewise. + * testsuite/gas/cfi/cfi-mips-1.d: Likewise. + 2016-10-08 Alan Modra * Makefile.am (EXTRA_as_new_SOURCES): Add config/rl78-parse.y and diff --git a/gas/testsuite/gas/cfi/cfi-common-1.d b/gas/testsuite/gas/cfi/cfi-common-1.d index 40000b87662..876c5f22867 100644 --- a/gas/testsuite/gas/cfi/cfi-common-1.d +++ b/gas/testsuite/gas/cfi/cfi-common-1.d @@ -9,7 +9,7 @@ Contents of the .eh_frame section: Code alignment factor: .* Data alignment factor: .* Return address column: .* - Augmentation data: [01]b + Augmentation data: [01][abc] DW_CFA_nop DW_CFA_nop diff --git a/gas/testsuite/gas/cfi/cfi-common-2.d b/gas/testsuite/gas/cfi/cfi-common-2.d index 1e7092ccb28..41bbb05ea2a 100644 --- a/gas/testsuite/gas/cfi/cfi-common-2.d +++ b/gas/testsuite/gas/cfi/cfi-common-2.d @@ -9,9 +9,9 @@ Contents of the .eh_frame section: Code alignment factor: .* Data alignment factor: .* Return address column: .* - Augmentation data: [01]b + Augmentation data: [01][abc] #... -00000014 0+00[12][c0] 0+0018 FDE cie=0+0000 pc=.* +00000014 0+00[12][c08] 0+0018 FDE cie=0+0000 pc=.* DW_CFA_advance_loc: 4 to .* DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16 DW_CFA_advance_loc: 4 to .* diff --git a/gas/testsuite/gas/cfi/cfi-common-3.d b/gas/testsuite/gas/cfi/cfi-common-3.d index 954556d07d1..7013c2f3e1d 100644 --- a/gas/testsuite/gas/cfi/cfi-common-3.d +++ b/gas/testsuite/gas/cfi/cfi-common-3.d @@ -9,9 +9,9 @@ Contents of the .eh_frame section: Code alignment factor: .* Data alignment factor: .* Return address column: .* - Augmentation data: [01]b + Augmentation data: [01][abc] #... -00000014 0+0010 0+0018 FDE cie=00000000 pc=.* +00000014 0+001[08] 0+0018 FDE cie=00000000 pc=.* DW_CFA_advance_loc: 4 to .* DW_CFA_remember_state DW_CFA_restore_state diff --git a/gas/testsuite/gas/cfi/cfi-common-4.d b/gas/testsuite/gas/cfi/cfi-common-4.d index 24b218b107a..a2a4a5c23d7 100644 --- a/gas/testsuite/gas/cfi/cfi-common-4.d +++ b/gas/testsuite/gas/cfi/cfi-common-4.d @@ -9,13 +9,13 @@ Contents of the .eh_frame section: Code alignment factor: .* Data alignment factor: .* Return address column: .* - Augmentation data: [01]b + Augmentation data: [01][abc] #... -00000014 0+0010 0+0018 FDE cie=0+0000 pc=.* +00000014 0+001[08] 0+0018 FDE cie=0+0000 pc=.* DW_CFA_remember_state DW_CFA_restore_state #... -00000028 0+001[04] 0+002c FDE cie=0+0000 pc=.* +000000(28|30) 0+001[04c] 0+00(2c|34) FDE cie=0+0000 pc=.* DW_CFA_remember_state DW_CFA_restore_state #pass diff --git a/gas/testsuite/gas/cfi/cfi-common-5.d b/gas/testsuite/gas/cfi/cfi-common-5.d index fa2292fea5f..75f5138215c 100644 --- a/gas/testsuite/gas/cfi/cfi-common-5.d +++ b/gas/testsuite/gas/cfi/cfi-common-5.d @@ -8,15 +8,15 @@ Contents of the .eh_frame section: Code alignment factor: .* Data alignment factor: .* Return address column: .* - Augmentation data: [01]b + Augmentation data: [01][abc] #... -00000014 0+0014 0+0018 FDE cie=0+0000 pc=.* +00000014 0+001[4c] 0+0018 FDE cie=0+0000 pc=.* DW_CFA_advance_loc: 4 to .* DW_CFA_remember_state DW_CFA_advance_loc: 4 to .* DW_CFA_restore_state #... -0000002c 0+001[48] 0+0030 FDE cie=0+0000 pc=.* +000000(2c|34) 0+00[12][048] 0+00(30|38) FDE cie=0+0000 pc=.* DW_CFA_advance_loc: 4 to .* DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16 DW_CFA_advance_loc: 4 to .* diff --git a/gas/testsuite/gas/cfi/cfi-common-7.d b/gas/testsuite/gas/cfi/cfi-common-7.d index 3241a9fcca6..d216ac4cda3 100644 --- a/gas/testsuite/gas/cfi/cfi-common-7.d +++ b/gas/testsuite/gas/cfi/cfi-common-7.d @@ -9,13 +9,13 @@ Contents of the .eh_frame section: Code alignment factor: .* Data alignment factor: .* Return address column: .* - Augmentation data: [01]b + Augmentation data: [01][abc] DW_CFA_nop DW_CFA_nop DW_CFA_nop -00000014 0+00(18|1c|20) 0+0018 FDE cie=0+0000 pc=.* +00000014 0+00(18|1c|20|28) 0+0018 FDE cie=0+0000 pc=.* DW_CFA_advance_loc: 16 to .* DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16 DW_CFA_advance_loc[24]: 75040 to .* diff --git a/gas/testsuite/gas/cfi/cfi-common-8.d b/gas/testsuite/gas/cfi/cfi-common-8.d index 61556909e20..70047412a86 100644 --- a/gas/testsuite/gas/cfi/cfi-common-8.d +++ b/gas/testsuite/gas/cfi/cfi-common-8.d @@ -9,7 +9,7 @@ Contents of the .eh_frame section: Code alignment factor: .* Data alignment factor: .* Return address column: .* - Augmentation data: [01]b + Augmentation data: [01][abc] DW_CFA_nop DW_CFA_nop diff --git a/gas/testsuite/gas/cfi/cfi-common-9.d b/gas/testsuite/gas/cfi/cfi-common-9.d index 33f01762a08..17f55e4d6ea 100644 --- a/gas/testsuite/gas/cfi/cfi-common-9.d +++ b/gas/testsuite/gas/cfi/cfi-common-9.d @@ -9,7 +9,7 @@ Contents of the .eh_frame section: Code alignment factor: .* Data alignment factor: .* Return address column: .* - Augmentation data: [01]b + Augmentation data: [01][abc] DW_CFA_nop DW_CFA_nop diff --git a/gas/testsuite/gas/cfi/cfi-mips-1.d b/gas/testsuite/gas/cfi/cfi-mips-1.d index 6635b9f1813..3b17aec5c78 100644 --- a/gas/testsuite/gas/cfi/cfi-mips-1.d +++ b/gas/testsuite/gas/cfi/cfi-mips-1.d @@ -8,14 +8,14 @@ Contents of the .eh_frame section: Code alignment factor: 1 Data alignment factor: -4 Return address column: 31 - Augmentation data: 0b + Augmentation data: 0[bc] DW_CFA_def_cfa_register: r29 DW_CFA_def_cfa: r29 ofs 0 DW_CFA_nop DW_CFA_nop -0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+0000..0+002c +0+0018 0+00(1c|24) 0+001c FDE cie=0+0000 pc=0+0000..0+002c DW_CFA_advance_loc: 4 to 0+0004 DW_CFA_def_cfa_offset: 8 DW_CFA_advance_loc: 4 to 0+0008 -- 2.30.2