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

* resolve.cc (Symbol_table::resolve): When merging common symbols,

Browse source 
keep the larger alignment.
This commit is contained in:
Ian Lance Taylor 2012-03-13 16:08:53 +00:00
parent 87b0bb13cb
commit fd32500759
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gold/ChangeLog
View file

@ -1,3 +1,8 @@
2012-03-13 Ian Lance Taylor <iant@google.com>
* resolve.cc (Symbol_table::resolve): When merging common symbols,
keep the larger alignment.
2012-03-12 Cary Coutant <ccoutant@google.com>
* dwarf_reader.cc (Sized_dwarf_line_info::process_one_opcode): Fix

19
gold/resolve.cc
View file

@ -356,9 +356,15 @@ Symbol_table::resolve(Sized_symbol<size>* to,
&adjust_dyndef))
{
elfcpp::STB tobinding = to->binding();
typename Sized_symbol<size>::Value_type tovalue = to->value();
this->override(to, sym, st_shndx, is_ordinary, object, version);
if (adjust_common_sizes && tosize > to->symsize())
to->set_symsize(tosize);
if (adjust_common_sizes)
{
if (tosize > to->symsize())
to->set_symsize(tosize);
if (tovalue > to->value())
to->set_value(tovalue);
}
if (adjust_dyndef)
{
// We are overriding an UNDEF or WEAK UNDEF with a DYN DEF.
@ -368,8 +374,13 @@ Symbol_table::resolve(Sized_symbol<size>* to,
}
else
{
if (adjust_common_sizes && sym.get_st_size() > tosize)
to->set_symsize(sym.get_st_size());
if (adjust_common_sizes)
{
if (sym.get_st_size() > tosize)
to->set_symsize(sym.get_st_size());
if (sym.get_st_value() > to->value())
to->set_value(sym.get_st_value());
}
if (adjust_dyndef)
{
// We are keeping a DYN DEF after seeing an UNDEF or WEAK UNDEF.