From 5c144731ed7b9ad39c947f8411b1dde4fbdda2e6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 5 Oct 2017 13:25:44 +0100 Subject: [PATCH] Change readelf so that when --wide is active a relocation's full name is displayed. PR 22262 binutils* readelf.c (dump_relocations): Do not truncate reloc names when displaying output in wide mode. ld * testsuite/ld-powerpc/relocsort.d: Update expected output (for longer reloc names). --- binutils/ChangeLog | 6 ++++++ binutils/readelf.c | 2 +- ld/ChangeLog | 6 ++++++ ld/testsuite/ld-powerpc/relocsort.d | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 784ae171a54..8af4719be26 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2017-10-05 Nick Clifton + + PR 22262 + * readelf.c (dump_relocations): Do not truncate reloc names when + displaying output in wide mode. + 2017-10-05 Nick Clifton * README-how-to-make-a-release: Merge steps 3, 4 and 5, and insert diff --git a/binutils/readelf.c b/binutils/readelf.c index 260aedf65b5..3cdde6c3cf8 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -1542,7 +1542,7 @@ dump_relocations (FILE * file, if (rtype == NULL) printf (_("unrecognized: %-7lx"), (unsigned long) type & 0xffffffff); else - printf (do_wide ? "%-22.22s" : "%-17.17s", rtype); + printf (do_wide ? "%-22s" : "%-17.17s", rtype); if (elf_header.e_machine == EM_ALPHA && rtype != NULL diff --git a/ld/ChangeLog b/ld/ChangeLog index 7c266e61170..fb94a88d602 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2017-10-05 Nick Clifton + + PR 22262 + * testsuite/ld-powerpc/relocsort.d: Update expected output (for + longer reloc names). + 2017-10-05 Alan Modra PR 21167 diff --git a/ld/testsuite/ld-powerpc/relocsort.d b/ld/testsuite/ld-powerpc/relocsort.d index a32e7253772..663b75bd678 100644 --- a/ld/testsuite/ld-powerpc/relocsort.d +++ b/ld/testsuite/ld-powerpc/relocsort.d @@ -15,7 +15,7 @@ 0+0 +[0-9a-f]+ R_PPC64_ADDR16_HA +6 0+0 +[0-9a-f]+ R_PPC64_ADDR14 +7 0+0 +[0-9a-f]+ R_PPC64_ADDR14_BRTAKEN +8 -0+0 +[0-9a-f]+ R_PPC64_ADDR14_BRNTAKE +9 +0+0 +[0-9a-f]+ R_PPC64_ADDR14_BRNTAKEN +9 0+4 +[0-9a-f]+ R_PPC64_REL24 +0+0 __tls_get_addr \+ 0 0+4 +[0-9a-f]+ R_PPC64_TLSGD +0+0 x \+ 0 0+8 +[0-9a-f]+ R_PPC64_REL24 +a -- 2.30.2