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

Fix error from previous patch where tosize and tovalue were redefined 

in a block, shadowing the declarations outside the block.

gold/
	PR gold/17432
	* resolve.cc (Symbol_table::resolve): Fix local shadowing error.
This commit is contained in:
Cary Coutant 2014-09-30 16:06:50 -07:00
parent cd6da0366d
commit db4c959472
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gold/ChangeLog
View File

@ -1,3 +1,8 @@
2014-09-30 Cary Coutant <ccoutant@google.com>
PR gold/17432
* resolve.cc (Symbol_table::resolve): Fix local shadowing error.
2014-09-30 Kito Cheng <kito@0xlab.org>
PR gold/13597

4
gold/resolve.cc
View File

@ -317,8 +317,8 @@ Symbol_table::resolve(Sized_symbol<size>* to,
if (to->is_common() && !is_ordinary && st_shndx == elfcpp::SHN_COMMON)
{
adjust_common = true;
typename Sized_symbol<size>::Size_type tosize = to->symsize();
typename Sized_symbol<size>::Value_type tovalue = to->value();
tosize = to->symsize();
tovalue = to->value();
}
this->override(to, sym, st_shndx, is_ordinary, object, version);
if (adjust_common)