darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gold/

Browse source 
* object.cc (Sized_relobj_file::get_symbol_location_info): Set
    	type of enclosing symbol.
    	(Relocate_info::location): Check symbol type when describing symbol.
    	* object.h (Symbol_location_info): Remove unused line_number;
    	add enclosing_symbol_type.
    	* testsuite/debug_msg.sh: Adjust expected output.
This commit is contained in:
Cary Coutant 2013-05-21 20:56:13 +00:00
parent c8c735b963
commit 60e8b3fccd
4 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gold/ChangeLog
View file

@ -1,3 +1,12 @@
2013-05-21 Cary Coutant <ccoutant@google.com>
* object.cc (Sized_relobj_file::get_symbol_location_info): Set
type of enclosing symbol.
(Relocate_info::location): Check symbol type when describing symbol.
* object.h (Symbol_location_info): Remove unused line_number;
add enclosing_symbol_type.
* testsuite/debug_msg.sh: Adjust expected output.
2013-05-13 Cary Coutant <ccoutant@google.com> 2013-05-13 Cary Coutant <ccoutant@google.com>
* configure.ac: Export DEFAULT_TARGET. * configure.ac: Export DEFAULT_TARGET.

13
gold/object.cc
View file

@ -1,6 +1,6 @@
// object.cc -- support for an object file for linking in gold // object.cc -- support for an object file for linking in gold
// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 // Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
// Free Software Foundation, Inc. // Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>. // Written by Ian Lance Taylor <iant@google.com>.
@ -2687,6 +2687,7 @@ Sized_relobj_file<size, big_endian>::get_symbol_location_info(
&& (static_cast<off_t>(sym.get_st_value() + sym.get_st_size()) && (static_cast<off_t>(sym.get_st_value() + sym.get_st_size())
> offset)) > offset))
{ {
info->enclosing_symbol_type = sym.get_st_type();
if (sym.get_st_name() > names_size) if (sym.get_st_name() > names_size)
info->enclosing_symbol_name = "(invalid)"; info->enclosing_symbol_name = "(invalid)";
else else
@ -2996,12 +2997,10 @@ Relocate_info<size, big_endian>::location(size_t, off_t offset) const
ret += ":"; ret += ":";
ret += info.source_file; ret += info.source_file;
} }
size_t len = info.enclosing_symbol_name.length() + 100; ret += ":";
char* buf = new char[len]; if (info.enclosing_symbol_type == elfcpp::STT_FUNC)
snprintf(buf, len, _(":function %s"), ret += _("function ");
info.enclosing_symbol_name.c_str()); ret += info.enclosing_symbol_name;
ret += buf;
delete[] buf;
return ret; return ret;
} }

4
gold/object.h
View file

@ -1,6 +1,6 @@
// object.h -- support for an object file for linking in gold -*- C++ -*- // object.h -- support for an object file for linking in gold -*- C++ -*-
// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 // Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
// Free Software Foundation, Inc. // Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>. // Written by Ian Lance Taylor <iant@google.com>.
@ -103,7 +103,7 @@ struct Symbol_location_info
{ {
std::string source_file; std::string source_file;
std::string enclosing_symbol_name; std::string enclosing_symbol_name;
int line_number; elfcpp::STT enclosing_symbol_type;
}; };
// Data about a single relocation section. This is read in // Data about a single relocation section. This is read in

15
gold/testsuite/debug_msg.sh
View file

@ -2,7 +2,8 @@
# debug_msg.sh -- a test case for printing debug info for missing symbols. # debug_msg.sh -- a test case for printing debug info for missing symbols.
# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013
# Free Software Foundation, Inc.
# Written by Ian Lance Taylor <iant@google.com>. # Written by Ian Lance Taylor <iant@google.com>.
# This file is part of gold. # This file is part of gold.
@ -55,9 +56,9 @@ check_missing()
# We don't know how the compiler might order these variables, so we # We don't know how the compiler might order these variables, so we
# can't test for the actual offset from .data, hence the regexp. # can't test for the actual offset from .data, hence the regexp.
check debug_msg.err "debug_msg.o:debug_msg.cc:function fn_array: error: undefined reference to 'undef_fn1()'" check debug_msg.err "debug_msg.o:debug_msg.cc:fn_array: error: undefined reference to 'undef_fn1()'"
check debug_msg.err "debug_msg.o:debug_msg.cc:function fn_array: error: undefined reference to 'undef_fn2()'" check debug_msg.err "debug_msg.o:debug_msg.cc:fn_array: error: undefined reference to 'undef_fn2()'"
check debug_msg.err "debug_msg.o:debug_msg.cc:function badref1: error: undefined reference to 'undef_int'" check debug_msg.err "debug_msg.o:debug_msg.cc:badref1: error: undefined reference to 'undef_int'"
# These tests check only for the source file's file name (not the complete # These tests check only for the source file's file name (not the complete
# path) because use of -fdebug-prefix-map may change the path to the source # path) because use of -fdebug-prefix-map may change the path to the source
@ -93,9 +94,9 @@ check debug_msg.err "odr_violation2.cc:27"
# Check for the same error messages when using --compressed-debug-sections. # Check for the same error messages when using --compressed-debug-sections.
if test -r debug_msg_cdebug.err if test -r debug_msg_cdebug.err
then then
check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:function fn_array: error: undefined reference to 'undef_fn1()'" check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:fn_array: error: undefined reference to 'undef_fn1()'"
check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:function fn_array: error: undefined reference to 'undef_fn2()'" check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:fn_array: error: undefined reference to 'undef_fn2()'"
check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:function badref1: error: undefined reference to 'undef_int'" check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:badref1: error: undefined reference to 'undef_int'"
check debug_msg_cdebug.err ".*/debug_msg.cc:50: error: undefined reference to 'undef_fn1()'" check debug_msg_cdebug.err ".*/debug_msg.cc:50: error: undefined reference to 'undef_fn1()'"
check debug_msg_cdebug.err ".*/debug_msg.cc:55: error: undefined reference to 'undef_fn2()'" check debug_msg_cdebug.err ".*/debug_msg.cc:55: error: undefined reference to 'undef_fn2()'"
check debug_msg_cdebug.err ".*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'" check debug_msg_cdebug.err ".*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"