diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elflink.h | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f355ed9..64e6207 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -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 diff --git a/bfd/elflink.h b/bfd/elflink.h index 1e88b63..6fb9bba 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -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, |