* elflink.c (_bfd_elf_merge_symbol): Skip weak redefinition
regardless of strength of previous definition.
This commit is contained in:
parent
87538722be
commit
f41d945bae
@ -1,3 +1,8 @@
|
||||
2005-07-27 Alan Modra <amodra@bigpond.net.au>
|
||||
|
||||
* elflink.c (_bfd_elf_merge_symbol): Skip weak redefinition
|
||||
regardless of strength of previous definition.
|
||||
|
||||
2005-07-26 Alan Modra <amodra@bigpond.net.au>
|
||||
|
||||
* elflink.c (elf_gc_mark_dynamic_ref_symbol): Handle -shared.
|
||||
|
@ -1216,7 +1216,7 @@ _bfd_elf_merge_symbol (bfd *abfd,
|
||||
}
|
||||
|
||||
/* Skip weak definitions of symbols that are already defined. */
|
||||
if (newdef && olddef && newweak && !oldweak)
|
||||
if (newdef && olddef && newweak)
|
||||
*skip = TRUE;
|
||||
|
||||
/* If the old symbol is from a dynamic object, and the new symbol is
|
||||
|
Loading…
x
Reference in New Issue
Block a user