Correct elf_merge_st_other arguments for weak symbols

* elflink.c (_bfd_elf_merge_symbol): If merging a new weak
	symbol that will be skipped, we don't have a new definition.
This commit is contained in:
Alan Modra 2013-12-14 13:10:04 +10:30
parent 08159f13a2
commit 57fa7b8c7e
2 changed files with 9 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2013-12-14 Alan Modra <amodra@gmail.com>
* elflink.c (_bfd_elf_merge_symbol): If merging a new weak
symbol that will be skipped, we don't have a new definition.
2013-12-13 Kuan-Lin Chen <kuanlinchentw@gmail.com>
Wei-Cheng Wang <cole945@gmail.com>

View File

@ -1437,7 +1437,10 @@ _bfd_elf_merge_symbol (bfd *abfd,
if (!(oldbfd != NULL
&& (oldbfd->flags & BFD_PLUGIN) != 0
&& (abfd->flags & BFD_PLUGIN) == 0))
*skip = TRUE;
{
newdef = FALSE;
*skip = TRUE;
}
/* Merge st_other. If the symbol already has a dynamic index,
but visibility says it should not be visible, turn it into a