* elflink.h (elf_merge_symbol): Do merge symbols from the same BFD

if they appear to be specially created by the linker.
This commit is contained in:
Ian Lance Taylor 1999-07-19 19:08:33 +00:00
parent e50d80767c
commit accc7f6940
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,8 @@
1999-07-19 Ian Lance Taylor <ian@zembu.com>
* elflink.h (elf_merge_symbol): Do merge symbols from the same BFD
if they appear to be specially created by the linker.
1999-07-19 Nick Clifton <nickc@cygnus.com>
* targets.c (alternative_target): New field in bfd_target

View File

@ -368,8 +368,12 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
/* In cases involving weak versioned symbols, we may wind up trying
to merge a symbol with itself. Catch that here, to avoid the
confusion that results if we try to override a symbol with
itself. */
if (abfd == oldbfd)
itself. The additional tests catch cases like
_GLOBAL_OFFSET_TABLE_, which are regular symbols defined in a
dynamic object, which we do want to handle here. */
if (abfd == oldbfd
&& ((abfd->flags & DYNAMIC) == 0
|| (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0))
return true;
/* NEWDYN and OLDDYN indicate whether the new or old symbol,