Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 17:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR gold/12279

Browse Source 
* resolve.cc (Symbol_table::should_override): Add fromtype
	parameter.  Change all callers.  Give error when linking together
	TLS and non-TLS symbol.
	(Symbol_table::should_override_with_special): Add fromtype
	parameter.  Change all callers.
	* i386.cc (Target_i386::Relocate::relocate_tls): Don't crash if
	there is no TLS segment if we have reported some errors.
	* x86_64.cc (Target_x86_64::relocate_tls): Likewise.
This commit is contained in:
Ian Lance Taylor
2011-07-08 23:49:11 +00:00
parent 67181c72fb
commit 6285534768
6 changed files with 124 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gold/resolve.cc
View File

@@ -351,8 +351,8 @@ Symbol_table::resolve(Sized_symbol<size>* to,
bool adjust_common_sizes;
bool adjust_dyndef;
typename Sized_symbol<size>::Size_type tosize = to->symsize();
if (Symbol_table::should_override(to, frombits, OBJECT, object,
&adjust_common_sizes,
if (Symbol_table::should_override(to, frombits, sym.get_st_type(), OBJECT,
object, &adjust_common_sizes,
&adjust_dyndef))
{
elfcpp::STB tobinding = to->binding();
@@ -409,8 +409,8 @@ Symbol_table::resolve(Sized_symbol<size>* to,
bool
Symbol_table::should_override(const Symbol* to, unsigned int frombits,
Defined defined, Object* object,
bool* adjust_common_sizes,
elfcpp::STT fromtype, Defined defined,
Object* object, bool* adjust_common_sizes,
bool* adjust_dyndef)
{
*adjust_common_sizes = false;
@@ -434,7 +434,13 @@ Symbol_table::should_override(const Symbol* to, unsigned int frombits,
to->type());
}
// FIXME: Warn if either but not both of TO and SYM are STT_TLS.
if (to->type() == elfcpp::STT_TLS
? fromtype != elfcpp::STT_TLS
: fromtype == elfcpp::STT_TLS)
Symbol_table::report_resolve_problem(true,
_("symbol '%s' used as both __thread "
"and non-__thread"),
to, defined, object);
// We use a giant switch table for symbol resolution. This code is
// unwieldy, but: 1) it is efficient; 2) we definitely handle all
@@ -870,13 +876,15 @@ Symbol_table::report_resolve_problem(bool is_error, const char* msg,
// defining special symbols.
bool
Symbol_table::should_override_with_special(const Symbol* to, Defined defined)
Symbol_table::should_override_with_special(const Symbol* to,
elfcpp::STT fromtype,
Defined defined)
{
bool adjust_common_sizes;
bool adjust_dyn_def;
unsigned int frombits = global_flag | regular_flag | def_flag;
bool ret = Symbol_table::should_override(to, frombits, defined, NULL,
&adjust_common_sizes,
bool ret = Symbol_table::should_override(to, frombits, fromtype, defined,
NULL, &adjust_common_sizes,
&adjust_dyn_def);
gold_assert(!adjust_common_sizes && !adjust_dyn_def);
return ret;