From 0c628bba5afd16e0ab3d78ca81ab3f2d5342c50c Mon Sep 17 00:00:00 2001 From: Srinath Parvathaneni Date: Mon, 22 Jul 2019 14:46:11 +0100 Subject: [PATCH] Fixes the linker testcase "Secure gateway veneers:cmse functions debug information missing" which was failing due to output regular expression mismatch on arm-none-linux-gnueabihf targets. * ld/testsuite/ld-arm/cmse_main_sec_debug.d: Modify regexps to allow for output from a arm-none-linux-gnueabihf target. --- ld/ChangeLog | 5 +++++ ld/testsuite/ld-arm/cmse_main_sec_debug.d | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 4145096afc..08a84efe44 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2019-07-22 Srinath Parvathaneni + + * ld/testsuite/ld-arm/cmse_main_sec_debug.d: Modify regexps to + allow for output from a arm-none-linux-gnueabihf target. + 2019-07-20 Alan Modra PR 24827 diff --git a/ld/testsuite/ld-arm/cmse_main_sec_debug.d b/ld/testsuite/ld-arm/cmse_main_sec_debug.d index 61280b769c..2f01af295c 100644 --- a/ld/testsuite/ld-arm/cmse_main_sec_debug.d +++ b/ld/testsuite/ld-arm/cmse_main_sec_debug.d @@ -9,21 +9,21 @@ Contents of the \.debug_info section: Abbrev Offset: 0x0 Pointer Size: 4 <0>: Abbrev Number: 1 \(DW_TAG_compile_unit\) - DW_AT_producer : \(indirect string, offset: 0x6\): GNU C17 10.0.0 20190617 + DW_AT_producer : \(indirect string, offset: 0x[a-f0-9]+\): GNU C17 10.0.0 20190617 <10> DW_AT_language : 12 \(ANSI C99\) - <11> DW_AT_name : \(indirect string, offset: 0x0\): sec.c - <15> DW_AT_comp_dir : \(indirect string, offset: 0x2b\): Blinky - <19> DW_AT_ranges : 0x0 - <1d> DW_AT_low_pc : 0x0 - <21> DW_AT_stmt_list : 0x0 + <11> DW_AT_name : \(indirect string, offset: 0x[a-f0-9]+\): sec.c + <15> DW_AT_comp_dir : \(indirect string, offset: 0x[a-f0-9]+\): Blinky + <19> DW_AT_ranges : 0x[a-f0-9]+ + <1d> DW_AT_low_pc : 0x[a-f0-9]+ + <21> DW_AT_stmt_list : 0x[a-f0-9]+ <1><25>: Abbrev Number: 2 \(DW_TAG_subprogram\) <26> DW_AT_external : 1 - <26> DW_AT_name : \(indirect string, offset: 0x1e\): SecureLED_On + <26> DW_AT_name : \(indirect string, offset: 0x[a-f0-9]+\): SecureLED_On <2a> DW_AT_decl_file : 1 <2b> DW_AT_decl_line : 2 <2c> DW_AT_decl_column : 1 - <2d> DW_AT_low_pc : 0x8000 - <31> DW_AT_high_pc : 0xc + <2d> DW_AT_low_pc : 0x[a-f0-9]+ + <31> DW_AT_high_pc : 0x[a-f0-9]+ <35> DW_AT_frame_base : 1 byte block: 9c \(DW_OP_call_frame_cfa\) <37> DW_AT_GNU_all_call_sites: 1 <1><37>: Abbrev Number: 0 -- 2.34.1