aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elfxx-x86.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index afa66e0..8a9b966 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-17 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/23055
+ * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Use a
+ normal input file with compatible relocation.
+
2018-04-18 Alan Modra <amodra@gmail.com>
* Makefile.am: Remove support for assorted i386 aout and coff targets.
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 5f55c94..40157b8 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -2518,7 +2518,9 @@ error_alignment:
abfd = abfd->link.next)
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
&& (abfd->flags
- & (DYNAMIC | BFD_LINKER_CREATED | BFD_PLUGIN)) == 0)
+ & (DYNAMIC | BFD_LINKER_CREATED | BFD_PLUGIN)) == 0
+ && bed->relocs_compatible (abfd->xvec,
+ info->output_bfd->xvec))
{
htab->elf.dynobj = abfd;
dynobj = abfd;