Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

* symtab.cc (Symbol_table::add_from_object): Handle saw_undefined_

Browse Source 
and commons_ correctly when NAME/VERSION does not override
	NAME/NULL.
	* testsuite/ver_test_6.c: New file.
	* testsuite/Makefile.am (check_PROGRAMS): Add ver_test_6
	(ver_test_6_SOURCES, ver_test_6_DEPENDENCIES): New variables.
	(ver_test_6_LDFLAGS, ver_test_6_LDADD): New variables.
This commit is contained in:
Ian Lance Taylor
2008-03-27 18:19:09 +00:00
parent 38de72b9a0
commit 18e6b24e63
5 changed files with 74 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gold/symtab.cc
View File

@@ -584,19 +584,23 @@ Symbol_table::add_from_object(Object* object,
// This is the first time we have seen NAME/VERSION.
gold_assert(ins.first->second == NULL);
was_undefined = false;
was_common = false;
if (def && !insdef.second)
{
// We already have an entry for NAME/NULL. If we override
// it, then change it to NAME/VERSION.
ret = this->get_sized_symbol<size>(insdef.first->second);
was_undefined = ret->is_undefined();
was_common = ret->is_common();
this->resolve(ret, sym, orig_sym, object, version);
ins.first->second = ret;
}
else
{
was_undefined = false;
was_common = false;
Sized_target<size, big_endian>* target =
object->sized_target<size, big_endian>();
if (!target->has_make_symbol())