diff options
| author | H.J. Lu <hjl@lucon.org> | 2008-07-21 16:13:27 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@lucon.org> | 2008-07-21 16:13:27 +0000 |
| commit | ba30183ca86838c431fe297407dbd731adff6c8b (patch) | |
| tree | a6802588a1edcb15df9b91eb951fad82f6199f57 | |
| parent | e3eb525022161b9b4b8e5ca70f95aea617a99aab (diff) | |
| download | binutils-redhat-ba30183ca86838c431fe297407dbd731adff6c8b.tar.gz | |
2008-07-21 H.J. Lu <hongjiu.lu@intel.com>
PR ld/4424
* elflink.c (_bfd_elf_merge_symbol): Call bed->relocs_compatible
to check if 2 inputs are compatible.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elflink.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index dfbd19ffec..b5967c95e5 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2008-07-21 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/4424 + * elflink.c (_bfd_elf_merge_symbol): Call bed->relocs_compatible + to check if 2 inputs are compatible. + 2008-07-21 Sterling Augustine <sterling@tensilica.com> * elf.c (assign_file_positions_for_load_sections): Print vma in diff --git a/bfd/elflink.c b/bfd/elflink.c index de1939ac7c..69a7c6945c 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -881,9 +881,11 @@ _bfd_elf_merge_symbol (bfd *abfd, return FALSE; *sym_hash = h; + bed = get_elf_backend_data (abfd); + /* This code is for coping with dynamic objects, and is only useful if we are doing an ELF link. */ - if (info->output_bfd->xvec != abfd->xvec) + if (!(*bed->relocs_compatible) (abfd->xvec, info->output_bfd->xvec)) return TRUE; /* For merging, we only care about real symbols. */ @@ -970,7 +972,6 @@ _bfd_elf_merge_symbol (bfd *abfd, && h->root.type != bfd_link_hash_undefweak && h->root.type != bfd_link_hash_common); - bed = get_elf_backend_data (abfd); /* When we try to create a default indirect symbol from the dynamic definition with the default version, we skip it if its type and the type of existing regular definition mismatch. We only do it |