From b9eb56c1fd7e43313494e4f50ed4f61351e49b16 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 7 Oct 2008 12:03:18 +0000 Subject: [PATCH] * readelf.c (process_section_headers): Do not cut the section names and types if running with --wide. * ld-ia64/tlsbin.rd: Update expected output now that --wide does not truncate section names. * ld-ia64/tlspic.rd: Likewise. --- binutils/ChangeLog | 5 +++++ binutils/readelf.c | 3 ++- ld/testsuite/ChangeLog | 6 ++++++ ld/testsuite/ld-ia64/tlsbin.rd | 4 ++-- ld/testsuite/ld-ia64/tlspic.rd | 4 ++-- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 2733543eb84..aa8d4f477f0 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2008-10-07 Jan Kratochvil + + * readelf.c (process_section_headers): Do not cut the section names and + types if running with --wide. + 2008-10-06 Tom Tromey * dwarf.c (display_debug_frames): Change text for uniformity. diff --git a/binutils/readelf.c b/binutils/readelf.c index 2d356a69626..c4bdc1dfd8d 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -4375,7 +4375,8 @@ process_section_headers (FILE *file) get_section_type_name (section->sh_type)); } else - printf (" [%2u] %-17.17s %-15.15s ", + printf ((do_wide ? " [%2u] %-17s %-15s " + : " [%2u] %-17.17s %-15.15s "), i, SECTION_NAME (section), get_section_type_name (section->sh_type)); diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index eca0c795036..a9e1d841485 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-10-07 Nick Clifton + + * ld-ia64/tlsbin.rd: Update expected output now that --wide does + not truncate section names. + * ld-ia64/tlspic.rd: Likewise. + 2008-10-06 Tom Tromey * ld-elf/eh1.d, ld-elf/eh2.d, ld-elf/eh3.d, ld-elf/eh4.d, diff --git a/ld/testsuite/ld-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd index 7f130a40cfc..ca0d69eb6be 100644 --- a/ld/testsuite/ld-ia64/tlsbin.rd +++ b/ld/testsuite/ld-ia64/tlsbin.rd @@ -15,10 +15,10 @@ Section Headers: +\[[ 0-9]+\] .dynsym +.* +\[[ 0-9]+\] .dynstr +.* +\[[ 0-9]+\] .rela.dyn +.* - +\[[ 0-9]+\] .rela.IA_64.pltof +.* + +\[[ 0-9]+\] .rela.IA_64.pltoff +.* +\[[ 0-9]+\] .plt +.* +\[[ 0-9]+\] .text +PROGBITS +40+1000 0+1000 0+140 00 +AX +0 +0 4096 - +\[[ 0-9]+\] .IA_64.unwind_inf +.* + +\[[ 0-9]+\] .IA_64.unwind_info +.* +\[[ 0-9]+\] .IA_64.unwind +.* +\[[ 0-9]+\] .tdata +PROGBITS +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+60 00 WAT +0 +0 +4 +\[[ 0-9]+\] .tbss +NOBITS +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+40 00 WAT +0 +0 +1 diff --git a/ld/testsuite/ld-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd index 509e598461b..9bf43876637 100644 --- a/ld/testsuite/ld-ia64/tlspic.rd +++ b/ld/testsuite/ld-ia64/tlspic.rd @@ -14,10 +14,10 @@ Section Headers: +\[[ 0-9]+\] .dynsym +.* +\[[ 0-9]+\] .dynstr +.* +\[[ 0-9]+\] .rela.dyn +.* - +\[[ 0-9]+\] .rela.IA_64.pltof +.* + +\[[ 0-9]+\] .rela.IA_64.pltoff +.* +\[[ 0-9]+\] .plt +.* +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+110 00 +AX +0 +0 4096 - +\[[ 0-9]+\] .IA_64.unwind_inf +.* + +\[[ 0-9]+\] .IA_64.unwind_info +.* +\[[ 0-9]+\] .IA_64.unwind +.* +\[[ 0-9]+\] .tdata +PROGBITS +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+60 00 WAT +0 +0 +4 +\[[ 0-9]+\] .tbss +NOBITS +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+20 00 WAT +0 +0 +1 -- 2.30.2