OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* resolve.cc (Symbol_table::resolve): Add symbols to the list of 

ODR candidates if only one is weak.
This commit is contained in:
Ian Lance Taylor 2010-01-11 05:44:04 +00:00
parent 6ae8025abb
commit 7198066bc1
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gold/ChangeLog
View File

@ -1,3 +1,8 @@
2010-01-10 Ian Lance Taylor <iant@google.com>
* resolve.cc (Symbol_table::resolve): Add symbols to the list of
ODR candidates if only one is weak.
2010-01-08 Ian Lance Taylor <iant@google.com>
* script.cc (Version_script_info::build_expression_list_lookup):

12
gold/resolve.cc
View File

@ -342,13 +342,15 @@ Symbol_table::resolve(Sized_symbol<size>* to,
// reference, could be a One Definition Rule (ODR) violation --
// especially if the types or sizes of the references differ. We'll
// store such pairs and look them up later to make sure they
// actually refer to the same lines of code. (Note: not all ODR
// violations can be found this way, and not everything this finds
// is an ODR violation. But it's helpful to warn about.)
// actually refer to the same lines of code. We also check
// combinations of weak and strong, which might occur if one case is
// inline and the other is not. (Note: not all ODR violations can
// be found this way, and not everything this finds is an ODR
// violation. But it's helpful to warn about.)
bool to_is_ordinary;
if (parameters->options().detect_odr_violations()
&& sym.get_st_bind() == elfcpp::STB_WEAK
&& to->binding() == elfcpp::STB_WEAK
&& (sym.get_st_bind() == elfcpp::STB_WEAK
|| to->binding() == elfcpp::STB_WEAK)
&& orig_st_shndx != elfcpp::SHN_UNDEF
&& to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF
&& to_is_ordinary