[PATCH][BINUTILS-2_32][ARM]: Correct the regular expressions in cmse_main_sec_debug.d file. (backport BINUTILS-2_32)

Srinath Parvathaneni Srinath.Parvathaneni@arm.com
Thu Jul 25 14:27:00 GMT 2019


Hi All,

The linker test "Secure gateway veneers:cmse functions debug information missing" is 
failing due to output regular expression mismatch on arm-none-linux-gnueabihf target.
This patch fixes the issue.

Bootstrapped on arm-none-linux-gnueabihf and regression tested on arm-none-eabi and 
found no regressions.

Ok for binutils-2_32-branch?

ld/ChangeLog:

2019-07-25  Srinath Parvathaneni  <srinath.parvathaneni@arm.com>

	Backport from mainline
	2019-07-22  Srinath Parvathaneni  <srinath.parvathaneni@arm.com>

	* testsuite/ld-arm/cmse_main_sec_debug.d: Modify regexps to
	allow for output from an arm-none-linux-gnueabihf target.


###############     Attachment also inlined for ease of reply    ###############


diff --git a/ld/testsuite/ld-arm/cmse_main_sec_debug.d b/ld/testsuite/ld-arm/cmse_main_sec_debug.d
index 61280b769c146ac1005bc19f7c547cb797d4baa2..2f01af295c0972f61fc3114dfe02992fed50945b 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><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_producer    : \(indirect string, offset: 0x6\): GNU C17 10.0.0 20190617
+    <c>   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

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: rb11505.patch.patch
URL: <https://sourceware.org/pipermail/binutils/attachments/20190725/37deacb1/attachment.ksh>


More information about the Binutils mailing list