Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-27 01:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR 10979

Browse Source 
* common.cc (Sort_commons::operator()): Stabilize sort when both
	entries are NULL.
	(Symbol_table::do_allocate_commons_list): When allocating common
	symbols, skip a symbol which is no longer common.
	* symtab.h (Symbol::is_common): Test whether the symbol comes from
	an object before checking its type.
	* testsuite/common_test_2.c: New file.
	* testsuite/common_test_3.c: New file.
	* testsuite/Makefile.am (check_PROGRAMS): Add common_test_2.
	(common_test_2_SOURCES, common_test_2_DEPENDENCIES): Define.
	(common_test_2_LDFLAGS, common_test_2_LDADD): Define.
	(common_test_2_pic.o, common_test_2.so): New targets.
	(common_test_3_pic.o, common_test_3.so): New targets.
	* testsuite/Makefile.in: Rebuild.
This commit is contained in:
Ian Lance Taylor
2009-12-31 05:07:22 +00:00
parent d7bb574500
commit eda294df6d
7 changed files with 146 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gold/common.cc
View File

@@ -91,7 +91,16 @@ bool
Sort_commons<size>::operator()(const Symbol* pa, const Symbol* pb) const
{
if (pa == NULL)
return false;
{
if (pb == NULL)
{
// Stabilize sort. The order really doesn't matter, because
// these entries will be discarded, but we want to return
// the same result every time we compare pa and pb.
return pa < pb;
}
return false;
}
if (pb == NULL)
return true;
@@ -312,6 +321,17 @@ Symbol_table::do_allocate_commons_list(
Symbol* sym = *p;
if (sym == NULL)
break;
// Because we followed forwarding symbols above, but we didn't
// do it reliably before adding symbols to the list, it is
// possible for us to have the same symbol on the list twice.
// This can happen in the horrible case where a program defines
// a common symbol with the same name as a versioned libc
// symbol. That will show up here as a symbol which has already
// been allocated and is therefore no longer a common symbol.
if (!sym->is_common())
continue;
Sized_symbol<size>* ssym = this->get_sized_symbol<size>(sym);
// Record the symbol in the map file now, before we change its