Skip to content
This repository was archived by the owner on Jul 15, 2021. It is now read-only.

Commit ae9ac79

Browse files
committed
Harmonize readelf's output for version sections.
PR 24627 binutils * readelf.c (process_version_sections): Add 0x prefix to address display. Correct indentation. ld * testsuite/ld-elf/ver_def.vd: Update expected output.
1 parent 54a471e commit ae9ac79

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

binutils/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2019-05-30 Nick Clifton <[email protected]>
2+
3+
PR 24627
4+
* readelf.c (process_version_sections): Add 0x prefix to address
5+
display. Correct indentation.
6+
17
2019-05-30 Alan Modra <[email protected]>
28

39
* testsuite/lib/binutils-common.exp (supports_gnu_unique): Add

binutils/readelf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10550,7 +10550,7 @@ process_version_sections (Filedata * filedata)
1055010550
printable_section_name (filedata, section),
1055110551
section->sh_info);
1055210552

10553-
printf (_(" Addr: 0x"));
10553+
printf (_(" Addr: 0x"));
1055410554
printf_vma (section->sh_addr);
1055510555
printf (_(" Offset: %#08lx Link: %u (%s)\n"),
1055610556
(unsigned long) section->sh_offset, section->sh_link,
@@ -10842,7 +10842,7 @@ process_version_sections (Filedata * filedata)
1084210842
total),
1084310843
printable_section_name (filedata, section), (unsigned long) total);
1084410844

10845-
printf (_(" Addr: "));
10845+
printf (_(" Addr: 0x"));
1084610846
printf_vma (section->sh_addr);
1084710847
printf (_(" Offset: %#08lx Link: %u (%s)\n"),
1084810848
(unsigned long) section->sh_offset, section->sh_link,

ld/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2019-05-30 Nick Clifton <[email protected]>
2+
3+
PR 24627
4+
* testsuite/ld-elf/ver_def.vd: Update expected output.
5+
16
2019-05-30 Alan Modra <[email protected]>
27

38
PR 24596

ld/testsuite/ld-elf/ver_def.vd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# line at the end in particular (hence #pass must not be used here).
77

88
Version symbols section '\.gnu\.version' contains 4 entries:
9-
Addr: [0-9a-f]+ +Offset: 0x[0-9a-f]+ +Link: 2 \(\.dynsym\)
9+
+Addr: 0x[0-9a-f]+ +Offset: 0x[0-9a-f]+ +Link: 2 \(\.dynsym\)
1010
+000: +0 \(\*local\*\) +2 \(ver_foo\) +1 \(\*global\*\) +2 \(ver_foo\) +
1111

1212
Version definition section '\.gnu\.version_d' contains 2 entries:

0 commit comments

Comments
 (0)