espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

objdump, readelf: Emit "CU:" format only when wide output is requested

Browse Source 
As pre-approved by Alan in
https://sourceware.org/pipermail/binutils/2021-September/118019.html
and I believe people have run into getting testsuite failures for
test-environments with "long" directory names, at least once more
since that time.  Enough.  I grepped the gas, binutils and ld
testsuites for "CU:" to catch target-specific occurrences, but I
noticed none.  I chose to remove "CU:" on the objdump tests instead of
changing options to get the wide format, so as to keep the name of the
test consistent with actual options; but added it to the readelf
options for the gas test as I believe the "CU:" format is preferable.

Tested for cris-elf and native x86_64-pc-linux-gnu.

binutils:
	* dwarf.c (display_debug_lines_decoded): Don't check the
	string length of the directory, instead emit the "CU: dir/name"
	format only if wide output is requested.
	* testsuite/binutils-all/dw5.W, testsuite/binutils-all/objdump.WL:
	Adjust accordingly.

gas:
	* testsuite/gas/elf/dwarf-5-loc0.d: Add -W to readelf options.
This commit is contained in:
Hans-Peter Nilsson
2022-01-12 05:41:09 +01:00
committed by Hans-Peter Nilsson
parent b02db37812
commit c4f5871457
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
binutils/dwarf.c
View File

@ -5137,7 +5137,7 @@ display_debug_lines_decoded (struct dwarf_section * section,
else
directory = (char *) directory_table[ix - 1];
if (do_wide || strlen (directory) < 76)
if (do_wide)
printf (_("CU: %s/%s:\n"), directory, file_table[0].name);
else
printf ("%s:\n", file_table[0].name);

2
binutils/testsuite/binutils-all/dw5.W
View File

@ -347,7 +347,7 @@ Raw dump of debug contents of section .debug_line:
Contents of the .debug_line section:
CU: ./main.c:
main.c:
File name Line number Starting address View Stmt
main.c 6 0x1234 x
main.c 6 0x12346 x

2
binutils/testsuite/binutils-all/objdump.WL
View File

@ -3,7 +3,7 @@
Contents of the \.debug_line section:
CU: \./dw2-decodedline\.c:
dw2-decodedline\.c:
File name Line number Starting address View Stmt
directory/file1\.c:

2
gas/testsuite/gas/elf/dwarf-5-loc0.d
View File

@ -1,5 +1,5 @@
#as: -gdwarf-5
#readelf: -wL
#readelf: -W -wL
#name: DWARF5 .loc 0
# The am33 cr16 crx ft32 mn10 msp430 nds32 and rl78 targets do not evaluate the subtraction of symbols at assembly time.
# The riscv targets do not support the subtraction of symbols.