From bf150a0bad8d3fcfa17f5d6b5a5ca75efae855ed Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 28 Jan 2016 13:29:53 -0800 Subject: [PATCH] Set BFD_DECOMPRESS to decompress debug sections We should set BFD_DECOMPRESS to decompress debug sections when reading in DWARF debug sections. bfd/ PR binutils/19523 * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Set BFD_DECOMPRESS to decompress debug sections. binutils/ PR binutils/19523 * Makefile.am (check-DEJAGNU): Pass CC and CC_FOR_BUILD to runtest. * Makefile.in: Regenerated. * testsuite/binutils-all/compress.exp (test_gnu_debuglink): New proc. Run test_gnu_debuglink for native ELF build. --- bfd/ChangeLog | 6 ++ bfd/dwarf2.c | 4 +- binutils/ChangeLog | 10 +++ binutils/Makefile.am | 1 + binutils/Makefile.in | 1 + binutils/testsuite/binutils-all/compress.exp | 95 +++++++++++++++++++- 6 files changed, 115 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 85ac9c1ea21..7c464236998 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2016-01-28 H.J. Lu + + PR binutils/19523 + * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Set BFD_DECOMPRESS to + decompress debug sections. + 2016-01-25 Maciej W. Rozycki * elf32-arc.c (elf_arc_finish_dynamic_symbol): Rename `index' to diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index 9acaf87ca2b..4d6f8fcae19 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -3706,8 +3706,10 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd, fail more quickly. */ return FALSE; + /* Set BFD_DECOMPRESS to decompress debug sections. */ if ((debug_bfd = bfd_openr (debug_filename, NULL)) == NULL - || ! bfd_check_format (debug_bfd, bfd_object) + || !(debug_bfd->flags |= BFD_DECOMPRESS, + bfd_check_format (debug_bfd, bfd_object)) || (msec = find_debug_info (debug_bfd, debug_sections, NULL)) == NULL || !bfd_generic_link_read_symbols (debug_bfd)) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index d836de34b64..edc66cd4c09 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,13 @@ +2016-01-28 H.J. Lu + + PR binutils/19523 + * Makefile.am (check-DEJAGNU): Pass CC and CC_FOR_BUILD to + runtest. + * Makefile.in: Regenerated. + * testsuite/binutils-all/compress.exp (test_gnu_debuglink): New + proc. + Run test_gnu_debuglink for native ELF build. + 2016-01-20 Nick Clifton PR 19495 diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 39ef2ff33c1..18af2c886bc 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -192,6 +192,7 @@ check-DEJAGNU: site.exp EXPECT=$(EXPECT); export EXPECT; \ runtest=$(RUNTEST); \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + CC="$(CC)" CC_FOR_BUILD="$(CC_FOR_BUILD)" \ CC_FOR_TARGET="$(CC_FOR_TARGET)" CFLAGS_FOR_TARGET="$(CFLAGS)" \ $$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \ $(RUNTESTFLAGS); \ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 2acf8ce10f5..bd4f7921a3c 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -1290,6 +1290,7 @@ check-DEJAGNU: site.exp EXPECT=$(EXPECT); export EXPECT; \ runtest=$(RUNTEST); \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + CC="$(CC)" CC_FOR_BUILD="$(CC_FOR_BUILD)" \ CC_FOR_TARGET="$(CC_FOR_TARGET)" CFLAGS_FOR_TARGET="$(CFLAGS)" \ $$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \ $(RUNTESTFLAGS); \ diff --git a/binutils/testsuite/binutils-all/compress.exp b/binutils/testsuite/binutils-all/compress.exp index d7c5e0a3201..b35aba42444 100644 --- a/binutils/testsuite/binutils-all/compress.exp +++ b/binutils/testsuite/binutils-all/compress.exp @@ -667,4 +667,97 @@ if { ([istarget "x86_64-*-elf*"] set testname "Convert x32 object to x86-64 (3)" convert_test "$testname" "--nocompress-debug-sections --x32" "-O elf64-x86-64 --compress-debug-sections=zlib-gnu" - } +} + +proc test_gnu_debuglink {} { + global srcdir + global subdir + global env + global CC_FOR_TARGET + global STRIP + global OBJCOPY + global OBJDUMP + + set test "gnu-debuglink" + if {![info exists CC_FOR_TARGET]} { + set CC_FOR_TARGET $env(CC) + } + if { $CC_FOR_TARGET == "" } { + unsupported $test + return + } + + if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog exectuable debug] != "" } { + fail "$test (build)" + return + } + set got [remote_exec host "$OBJDUMP -S tmpdir/testprog" "" "/dev/null" "tmpdir/testprog.dump"] + if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { + fail "$test (objcopy dump)" + return + } + if { [binutils_run $STRIP "--strip-debug --remove-section=.comment --remove-section=.note tmpdir/testprog -o tmpdir/testprog.strip"] != "" } { + fail "$test (strip)" + return + } + if { [binutils_run $OBJCOPY "--only-keep-debug --decompress-debug-sections tmpdir/testprog tmpdir/testprog.decompress"] != "" } { + fail "$test (objcopy decompress)" + return + } + if { [binutils_run $OBJCOPY "--only-keep-debug --compress-debug-sections tmpdir/testprog tmpdir/testprog.compress"] != "" } { + fail "$test (objcopy compress)" + return + } + if { [binutils_run $OBJCOPY "--add-gnu-debuglink=tmpdir/testprog.decompress tmpdir/testprog.strip tmpdir/testprog"] != "" } { + fail "$test (objcopy link decompress)" + return + } + set got [remote_exec host "$OBJDUMP -S tmpdir/testprog" "" "/dev/null" "tmpdir/testprog.decompress.dump"] + if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { + fail "$test (objcopy dump decompress)" + return + } + if { [binutils_run $OBJCOPY "--add-gnu-debuglink=tmpdir/testprog.compress tmpdir/testprog.strip tmpdir/testprog"] != "" } { + fail "$test (objcopy link compress)" + return + } + set got [remote_exec host "$OBJDUMP -S tmpdir/testprog" "" "/dev/null" "tmpdir/testprog.compress.dump"] + if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { + fail "$test (objcopy dump compress)" + return + } + + set src1 tmpdir/testprog.dump + set src2 tmpdir/testprog.compress.dump + send_log "cmp ${src1} ${src2}\n" + verbose "cmp ${src1} ${src2}" + set status [remote_exec build cmp "${src1} ${src2}"] + set exec_output [lindex $status 1] + set exec_output [prune_warnings $exec_output] + if ![string match "" $exec_output] then { + send_log "$exec_output\n" + verbose "$exec_output" 1 + fail "$test (objdump 1)" + } else { + pass "$test (objdump 1)" + } + + set src1 tmpdir/testprog.decompress.dump + set src2 tmpdir/testprog.compress.dump + send_log "cmp ${src1} ${src2}\n" + verbose "cmp ${src1} ${src2}" + set status [remote_exec build cmp "${src1} ${src2}"] + set exec_output [lindex $status 1] + set exec_output [prune_warnings $exec_output] + if ![string match "" $exec_output] then { + send_log "$exec_output\n" + verbose "$exec_output" 1 + fail "$test (objdump 2)" + } else { + pass "$test (objdump 2)" + } +} + +if {[isnative] && [is_elf_format]} then { + test_gnu_debuglink +} -- 2.30.2