espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-09-09 21:22:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

From Cary Coutant: Fix handling of versioned symbols, add some tests.

Browse Source
This commit is contained in:
Ian Lance Taylor
2007-12-21 23:31:19 +00:00
parent dc96b90a10
commit 99f8facac9
15 changed files with 501 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gold/symtab.cc
View File

@ -480,10 +480,18 @@ Symbol_table::add_from_object(Object* object,
// NAME/NULL point to NAME/VERSION.
insdef.first->second = ret;
}
else if (insdef.first->second != ret)
else if (insdef.first->second != ret
&& insdef.first->second->is_undefined())
{
// This is the unfortunate case where we already have
// entries for both NAME/VERSION and NAME/NULL.
// entries for both NAME/VERSION and NAME/NULL. Note
// that we don't want to combine them if the existing
// symbol is going to override the new one. FIXME: We
// currently just test is_undefined, but this may not do
// the right thing if the existing symbol is from a
// shared library and the new one is from a regular
// object.
const Sized_symbol<size>* sym2;
sym2 = this->get_sized_symbol SELECT_SIZE_NAME(size) (
insdef.first->second