From 3239a4231ff79bf8b67b8faaf414b1667486167c Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 19 Dec 2016 15:27:59 +0000 Subject: bfd: Improve lookup of file / line information for errors When looking up file and line information (used from the linker to report error messages) if no symbol is passed in, then use the symbol list to look for a matching symbol. If a matching symbol is found then use this to look up the file / line information. This should improve errors when looking up file / line information for data sections. Hopefully we should find a matching data symbol, which should, in turn (we hope) match a DW_TAG_variable in the DWARF, this should allow us to give accurate file / line errors for data symbols. As the hope is to find a matching DW_TAG_variable in the DWARF then we ignore section symbols, and prefer global symbols to locals. bfd/ChangeLog: * dwarf2.c (_bfd_dwarf2_find_nearest_line): Perform symbol lookup before trying to fine matching file and line information. ld/ChangeLog: * testsuite/ld-elf/shared.exp: Update expected results. * testsuite/ld-elf/dwarf2.err: Likewise --- ld/testsuite/ld-elf/dwarf2.err | 9 +++++---- ld/testsuite/ld-elf/shared.exp | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'ld/testsuite/ld-elf') diff --git a/ld/testsuite/ld-elf/dwarf2.err b/ld/testsuite/ld-elf/dwarf2.err index 872d282..b4ea67f 100644 --- a/ld/testsuite/ld-elf/dwarf2.err +++ b/ld/testsuite/ld-elf/dwarf2.err @@ -1,4 +1,5 @@ -tmpdir/dwarf2b\.o:\(\.data\+0x0\): multiple definition of `global_var' -tmpdir/dwarf2a\.o:\(\.data\+0x0\): first defined here -tmpdir/dwarf2b\.o:\(\.data\+0x4\): multiple definition of `other_var' -tmpdir/dwarf2a\.o:\(\.data\+0x4\): first defined here +tmpdir/dwarf2b\.o:.*dwarf2b\.c:1: multiple definition of `global_var' +tmpdir/dwarf2a\.o:.*dwarf2a\.c:1: first defined here +tmpdir/dwarf2b\.o:.*dwarf2b\.c:2: multiple definition of `other_var' +tmpdir/dwarf2a\.o:.*dwarf2a\.c:2: first defined here +#... \ No newline at end of file diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp index 9d5a9d9..3b8ab18 100644 --- a/ld/testsuite/ld-elf/shared.exp +++ b/ld/testsuite/ld-elf/shared.exp @@ -105,7 +105,7 @@ set build_tests { "-shared" "-fPIC" {beginwarn.c end.c} {{readelf {-S --wide} libbarw.rd} - {warning "^.*\\): warning: function foo is deprecated$"}} + {warning "^.*beginwarn.c:7: warning: function foo is deprecated$"}} "libbarw.so" "c"} {"Build hidden libbar.so" "-shared" "-fPIC" @@ -350,7 +350,7 @@ set run_tests [list \ [list "Run warn with versioned libfoo.so" \ "-Wl,--no-as-needed tmpdir/beginwarn.o tmpdir/libfoov.so" "" \ {main.c} "warn" "warn.out" \ - "" "c" {^.*\): warning: function foo is deprecated$} ] \ + "" "c" {^.*beginwarn.c:7: warning: function foo is deprecated$} ] \ [list "Run protected with versioned libfoo.so" \ "-Wl,--no-as-needed tmpdir/begin.o tmpdir/libfoov.so tmpdir/endprotected.o" "" \ {main.c} "protected" "normal.out" ] \ -- cgit v1.1