diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/resolve.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 20f84af..f636afa 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -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 diff --git a/gold/resolve.cc b/gold/resolve.cc index 52dae8b..07dff4a 100644 --- a/gold/resolve.cc +++ b/gold/resolve.cc @@ -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) |