From ea52a08872bbc62398e32df32d32d0d7366bf9c8 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 30 May 2012 14:33:12 +0000 Subject: [PATCH] * readelf.c (process_section_headers): Correct bug in previous delta - display full section type in wide mode. * ld-tic6x/shlib-1b.rd: Revert previous delta. * ld-tic6x/shlib-1rb.rd: Likewise. * ld-tic6x/shlib-1.rd: Likewise. * ld-tic6x/shlib-1r.rd: Likewise. * ld-tic6x/shlib-app-1b.rd: Likewise. * ld-tic6x/shlib-app-1rb.rd: Likewise. * ld-tic6x/shlib-app-1.rd: Likewise. * ld-tic6x/shlib-app-1r.rd: Likewise. * ld-tic6x/shlib-noindex.rd: Likewise. * ld-tic6x/static-app-1b.rd: Likewise. * ld-tic6x/static-app-1rb.rd: Likewise. * ld-tic6x/static-app-1.rd: Likewise. * ld-tic6x/static-app-1r.rd: Likewise. --- binutils/ChangeLog | 5 +++++ binutils/readelf.c | 12 +++++------- ld/testsuite/ChangeLog | 16 ++++++++++++++++ ld/testsuite/ld-tic6x/shlib-1.rd | 2 +- ld/testsuite/ld-tic6x/shlib-1b.rd | 2 +- ld/testsuite/ld-tic6x/shlib-1r.rd | 2 +- ld/testsuite/ld-tic6x/shlib-1rb.rd | 2 +- ld/testsuite/ld-tic6x/shlib-app-1.rd | 2 +- ld/testsuite/ld-tic6x/shlib-app-1b.rd | 2 +- ld/testsuite/ld-tic6x/shlib-app-1r.rd | 2 +- ld/testsuite/ld-tic6x/shlib-app-1rb.rd | 2 +- ld/testsuite/ld-tic6x/shlib-noindex.rd | 2 +- ld/testsuite/ld-tic6x/static-app-1.rd | 2 +- ld/testsuite/ld-tic6x/static-app-1b.rd | 2 +- ld/testsuite/ld-tic6x/static-app-1r.rd | 2 +- ld/testsuite/ld-tic6x/static-app-1rb.rd | 2 +- 16 files changed, 39 insertions(+), 20 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 2d2bc080855..2b916a8f9a4 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2012-05-30 Nick Clifton + + * readelf.c (process_section_headers): Correct bug in previous + delta - display full section type in wide mode. + 2012-05-28 Nick Clifton * readelf.c (print_symbol): Display multibyte characters in symbol diff --git a/binutils/readelf.c b/binutils/readelf.c index 762a1a87005..527edf2a6e9 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -4738,18 +4738,16 @@ process_section_headers (FILE * file) if (do_section_details) { print_symbol (INT_MAX, SECTION_NAME (section)); - putchar ('\n'); - if (is_32bit_elf || do_wide) - printf (" %-15.15s ", - get_section_type_name (section->sh_type)); + printf ("\n "); } else { print_symbol (-17, SECTION_NAME (section)); - printf (" %-15.15s ", - get_section_type_name (section->sh_type)); } - + + printf (do_wide ? " %-15s " : " %-15.15s ", + get_section_type_name (section->sh_type)); + if (is_32bit_elf) { const char * link_too_big = NULL; diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 7bdd72cfa61..fce658e94f1 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,19 @@ +2012-05-30 Nick Clifton + + * ld-tic6x/shlib-1b.rd: Revert previous delta. + * ld-tic6x/shlib-1rb.rd: Likewise. + * ld-tic6x/shlib-1.rd: Likewise. + * ld-tic6x/shlib-1r.rd: Likewise. + * ld-tic6x/shlib-app-1b.rd: Likewise. + * ld-tic6x/shlib-app-1rb.rd: Likewise. + * ld-tic6x/shlib-app-1.rd: Likewise. + * ld-tic6x/shlib-app-1r.rd: Likewise. + * ld-tic6x/shlib-noindex.rd: Likewise. + * ld-tic6x/static-app-1b.rd: Likewise. + * ld-tic6x/static-app-1rb.rd: Likewise. + * ld-tic6x/static-app-1.rd: Likewise. + * ld-tic6x/static-app-1r.rd: Likewise. + 2012-05-29 Nick Clifton * ld-tic6x/shlib-1b.rd: Update expected readelf output. diff --git a/ld/testsuite/ld-tic6x/shlib-1.rd b/ld/testsuite/ld-tic6x/shlib-1.rd index 470af6519ea..a0232cdfb6a 100644 --- a/ld/testsuite/ld-tic6x/shlib-1.rd +++ b/ld/testsuite/ld-tic6x/shlib-1.rd @@ -15,7 +15,7 @@ Section Headers: \[10\] \.got PROGBITS 10000100 002100 000028 00 WA 0 0 4 \[11\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 - \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00 0 0 1 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[14\] \.shstrtab STRTAB 00000000 002149 00007b 00 0 0 1 \[15\] \.symtab SYMTAB 00000000 00246c 0001a0 10 16 19 4 \[16\] \.strtab STRTAB 00000000 00260c 000059 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/shlib-1b.rd b/ld/testsuite/ld-tic6x/shlib-1b.rd index 470af6519ea..a0232cdfb6a 100644 --- a/ld/testsuite/ld-tic6x/shlib-1b.rd +++ b/ld/testsuite/ld-tic6x/shlib-1b.rd @@ -15,7 +15,7 @@ Section Headers: \[10\] \.got PROGBITS 10000100 002100 000028 00 WA 0 0 4 \[11\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 - \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00 0 0 1 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[14\] \.shstrtab STRTAB 00000000 002149 00007b 00 0 0 1 \[15\] \.symtab SYMTAB 00000000 00246c 0001a0 10 16 19 4 \[16\] \.strtab STRTAB 00000000 00260c 000059 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/shlib-1r.rd b/ld/testsuite/ld-tic6x/shlib-1r.rd index 470af6519ea..a0232cdfb6a 100644 --- a/ld/testsuite/ld-tic6x/shlib-1r.rd +++ b/ld/testsuite/ld-tic6x/shlib-1r.rd @@ -15,7 +15,7 @@ Section Headers: \[10\] \.got PROGBITS 10000100 002100 000028 00 WA 0 0 4 \[11\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 - \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00 0 0 1 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[14\] \.shstrtab STRTAB 00000000 002149 00007b 00 0 0 1 \[15\] \.symtab SYMTAB 00000000 00246c 0001a0 10 16 19 4 \[16\] \.strtab STRTAB 00000000 00260c 000059 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/shlib-1rb.rd b/ld/testsuite/ld-tic6x/shlib-1rb.rd index 470af6519ea..a0232cdfb6a 100644 --- a/ld/testsuite/ld-tic6x/shlib-1rb.rd +++ b/ld/testsuite/ld-tic6x/shlib-1rb.rd @@ -15,7 +15,7 @@ Section Headers: \[10\] \.got PROGBITS 10000100 002100 000028 00 WA 0 0 4 \[11\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 - \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00 0 0 1 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[14\] \.shstrtab STRTAB 00000000 002149 00007b 00 0 0 1 \[15\] \.symtab SYMTAB 00000000 00246c 0001a0 10 16 19 4 \[16\] \.strtab STRTAB 00000000 00260c 000059 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/shlib-app-1.rd b/ld/testsuite/ld-tic6x/shlib-app-1.rd index a7a48e5542a..e1809afdf29 100644 --- a/ld/testsuite/ld-tic6x/shlib-app-1.rd +++ b/ld/testsuite/ld-tic6x/shlib-app-1.rd @@ -16,7 +16,7 @@ Section Headers: \[11\] \.got PROGBITS 100000a0 0020a0 000020 00 WA 0 0 4 \[12\] \.neardata PROGBITS 100000c0 0020c0 00000c 00 WA 0 0 4 \[13\] \.bss NOBITS 100000cc 0020cc 000004 00 WA 0 0 4 - \[14\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020cc 000019 00 0 0 1 + \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00 0 0 1 \[15\] \.shstrtab STRTAB 00000000 0020e5 000080 00 0 0 1 \[16\] \.symtab SYMTAB 00000000 002438 0001a0 10 17 20 4 \[17\] \.strtab STRTAB 00000000 0025d8 000055 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/shlib-app-1b.rd b/ld/testsuite/ld-tic6x/shlib-app-1b.rd index e709d3f46a3..95547b01a7c 100644 --- a/ld/testsuite/ld-tic6x/shlib-app-1b.rd +++ b/ld/testsuite/ld-tic6x/shlib-app-1b.rd @@ -16,7 +16,7 @@ Section Headers: \[11\] \.got PROGBITS 100000a0 0020a0 000020 00 WA 0 0 4 \[12\] \.neardata PROGBITS 100000c0 0020c0 00000c 00 WA 0 0 4 \[13\] \.bss NOBITS 100000cc 0020cc 000004 00 WA 0 0 4 - \[14\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020cc 000019 00 0 0 1 + \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00 0 0 1 \[15\] \.shstrtab STRTAB 00000000 0020e5 000080 00 0 0 1 \[16\] \.symtab SYMTAB 00000000 002438 0001a0 10 17 20 4 \[17\] \.strtab STRTAB 00000000 0025d8 000055 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/shlib-app-1r.rd b/ld/testsuite/ld-tic6x/shlib-app-1r.rd index af7f5bdb879..566f2f911c5 100644 --- a/ld/testsuite/ld-tic6x/shlib-app-1r.rd +++ b/ld/testsuite/ld-tic6x/shlib-app-1r.rd @@ -15,7 +15,7 @@ Section Headers: \[10\] \.got PROGBITS 100000a0 0020a0 000020 00 WA 0 0 4 \[11\] \.neardata PROGBITS 100000c0 0020c0 000004 00 WA 0 0 4 \[12\] \.bss NOBITS 100000c4 0020c4 000004 00 WA 0 0 4 - \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020c4 000019 00 0 0 1 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00 0 0 1 \[14\] \.shstrtab STRTAB 00000000 0020dd 00007b 00 0 0 1 \[15\] \.symtab SYMTAB 00000000 002400 000160 10 16 18 4 \[16\] \.strtab STRTAB 00000000 002560 00004d 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd index 109144bd186..be163d94c01 100644 --- a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd +++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd @@ -15,7 +15,7 @@ Section Headers: \[10\] \.got PROGBITS 100000a0 0020a0 000020 00 WA 0 0 4 \[11\] \.neardata PROGBITS 100000c0 0020c0 000004 00 WA 0 0 4 \[12\] \.bss NOBITS 100000c4 0020c4 000004 00 WA 0 0 4 - \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020c4 000019 00 0 0 1 + \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00 0 0 1 \[14\] \.shstrtab STRTAB 00000000 0020dd 00007b 00 0 0 1 \[15\] \.symtab SYMTAB 00000000 002400 000160 10 16 18 4 \[16\] \.strtab STRTAB 00000000 002560 00004d 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/shlib-noindex.rd b/ld/testsuite/ld-tic6x/shlib-noindex.rd index 63e4bd8485d..e9b57c7a41d 100644 --- a/ld/testsuite/ld-tic6x/shlib-noindex.rd +++ b/ld/testsuite/ld-tic6x/shlib-noindex.rd @@ -16,7 +16,7 @@ Section Headers: \[11\] \.got PROGBITS 10000100 002100 000028 00 WA 0 0 4 \[12\] \.neardata PROGBITS 10000128 002128 000008 00 WA 0 0 4 \[13\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 - \[14\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00 0 0 1 + \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[15\] \.shstrtab STRTAB 00000000 002149 000080 00 0 0 1 \[16\] \.symtab SYMTAB 00000000 00249c 0001b0 10 17 20 4 \[17\] \.strtab STRTAB 00000000 00264c 000059 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/static-app-1.rd b/ld/testsuite/ld-tic6x/static-app-1.rd index ff6e26eb2c4..cec76d4558f 100644 --- a/ld/testsuite/ld-tic6x/static-app-1.rd +++ b/ld/testsuite/ld-tic6x/static-app-1.rd @@ -13,7 +13,7 @@ Section Headers: \[ 8\] \.got PROGBITS 100000c0 0020c0 000020 00 WA 0 0 4 \[ 9\] \.neardata PROGBITS 100000e0 0020e0 000014 00 WA 0 0 4 \[10\] \.bss NOBITS 100000f4 0020f4 000004 00 WA 0 0 4 - \[11\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020f4 000019 00 0 0 1 + \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00 0 0 1 \[12\] \.shstrtab STRTAB 00000000 00210d 000071 00 0 0 1 \[13\] \.symtab SYMTAB 00000000 0023d8 0001a0 10 14 19 4 \[14\] \.strtab STRTAB 00000000 002578 000060 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/static-app-1b.rd b/ld/testsuite/ld-tic6x/static-app-1b.rd index ff6e26eb2c4..cec76d4558f 100644 --- a/ld/testsuite/ld-tic6x/static-app-1b.rd +++ b/ld/testsuite/ld-tic6x/static-app-1b.rd @@ -13,7 +13,7 @@ Section Headers: \[ 8\] \.got PROGBITS 100000c0 0020c0 000020 00 WA 0 0 4 \[ 9\] \.neardata PROGBITS 100000e0 0020e0 000014 00 WA 0 0 4 \[10\] \.bss NOBITS 100000f4 0020f4 000004 00 WA 0 0 4 - \[11\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020f4 000019 00 0 0 1 + \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00 0 0 1 \[12\] \.shstrtab STRTAB 00000000 00210d 000071 00 0 0 1 \[13\] \.symtab SYMTAB 00000000 0023d8 0001a0 10 14 19 4 \[14\] \.strtab STRTAB 00000000 002578 000060 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/static-app-1r.rd b/ld/testsuite/ld-tic6x/static-app-1r.rd index d59eee99f70..cd8bc4c9d4a 100644 --- a/ld/testsuite/ld-tic6x/static-app-1r.rd +++ b/ld/testsuite/ld-tic6x/static-app-1r.rd @@ -13,7 +13,7 @@ Section Headers: \[ 8\] \.got PROGBITS 100000c0 0020c0 000020 00 WA 0 0 4 \[ 9\] \.neardata PROGBITS 100000e0 0020e0 00000c 00 WA 0 0 4 \[10\] \.bss NOBITS 100000ec 0020ec 000004 00 WA 0 0 4 - \[11\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020ec 000019 00 0 0 1 + \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00 0 0 1 \[12\] \.shstrtab STRTAB 00000000 002105 000071 00 0 0 1 \[13\] \.symtab SYMTAB 00000000 0023d0 000190 10 14 18 4 \[14\] \.strtab STRTAB 00000000 002560 00005e 00 0 0 1 diff --git a/ld/testsuite/ld-tic6x/static-app-1rb.rd b/ld/testsuite/ld-tic6x/static-app-1rb.rd index d59eee99f70..cd8bc4c9d4a 100644 --- a/ld/testsuite/ld-tic6x/static-app-1rb.rd +++ b/ld/testsuite/ld-tic6x/static-app-1rb.rd @@ -13,7 +13,7 @@ Section Headers: \[ 8\] \.got PROGBITS 100000c0 0020c0 000020 00 WA 0 0 4 \[ 9\] \.neardata PROGBITS 100000e0 0020e0 00000c 00 WA 0 0 4 \[10\] \.bss NOBITS 100000ec 0020ec 000004 00 WA 0 0 4 - \[11\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020ec 000019 00 0 0 1 + \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00 0 0 1 \[12\] \.shstrtab STRTAB 00000000 002105 000071 00 0 0 1 \[13\] \.symtab SYMTAB 00000000 0023d0 000190 10 14 18 4 \[14\] \.strtab STRTAB 00000000 002560 00005e 00 0 0 1 -- 2.30.2