diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2010-08-22 19:14:25 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2010-08-22 19:14:25 +0000 |
| commit | 39334f3a4789eeaf07b8d74fa40e01cd59413831 (patch) | |
| tree | ea053c019d193adbf243b67c6e869644cbd088d4 /bfd | |
| parent | a654efd60a7daee081082be0dae2a006759b6ea8 (diff) | |
| download | gdb-39334f3a4789eeaf07b8d74fa40e01cd59413831.zip gdb-39334f3a4789eeaf07b8d74fa40e01cd59413831.tar.gz gdb-39334f3a4789eeaf07b8d74fa40e01cd59413831.tar.bz2 | |
Don't check relocation if input ELF object ID doesn't match output.
bfd/
2010-08-22 H.J. Lu <hongjiu.lu@intel.com>
PR ld/11933
* elflink.c (elf_link_add_object_symbols): Don't check relocation
if input ELF object ID doesn't match output.
ld/testsuite/
2010-08-22 H.J. Lu <hongjiu.lu@intel.com>
PR ld/11933
* ld-x86-64/mixed1a.s: New.
* ld-x86-64/mixed1b.s: Likewise.
* ld-x86-64/mixed2a.s: Likewise.
* ld-x86-64/mixed2b.s: Likewise.
* ld-x86-64/x86-64.exp: Text mixed x86_64 and i386 inputs.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elflink.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ee27229..7ae8300 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2010-08-22 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/11933 + * elflink.c (elf_link_add_object_symbols): Don't check relocation + if input ELF object ID doesn't match output. + 2010-08-21 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * configure: Regenerate. diff --git a/bfd/elflink.c b/bfd/elflink.c index 074229f..2f67c47 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -4791,6 +4791,7 @@ error_free_dyn: if (! dynamic && is_elf_hash_table (htab) && bed->check_relocs != NULL + && elf_object_id (abfd) == elf_hash_table_id (htab) && (*bed->relocs_compatible) (abfd->xvec, info->output_bfd->xvec)) { asection *o; |