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).

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 784ae171a54ed024ed4f45915a432f24ff0cb6a1..8af4719be2652980b561ba2660cd7fc3fba22720 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-05  Nick Clifton  <nickc@redhat.com>
+
+       PR 22262
+       * readelf.c (dump_relocations): Do not truncate reloc names when
+       displaying output in wide mode.
+
 2017-10-05  Nick Clifton  <nickc@redhat.com>
 
        * 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 260aedf65b5d1b25a949db66421f9743700ce978..3cdde6c3cf81276d1af39e5dc1ee055799666135 100644 (file)
--- 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 7c266e611708791fbed64afe825c6f633ee2dd9e..fb94a88d6022606bed1216082669336e82be4a36 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-05  Nick Clifton  <nickc@redhat.com>
+
+       PR 22262
+       * testsuite/ld-powerpc/relocsort.d: Update expected output (for
+       longer reloc names).
+
 2017-10-05  Alan Modra  <amodra@gmail.com>
 
        PR 21167

diff --git a/ld/testsuite/ld-powerpc/relocsort.d b/ld/testsuite/ld-powerpc/relocsort.d
index a32e7253772c2e39f07b1096616972e66b011c6b..663b75bd67838266ee87bbd323fd092a08d3031f 100644 (file)
--- 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