x86: Check target_id instead of elf_machine_code

Since both elf32-i386.c and elf64-x86-64.c support targets with
different ELF_MACHINE_CODEs, _bfd_x86_elf_link_hash_table_create
should check target_id instead of elf_machine_code.

	* elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Check
	target_id instead of elf_machine_code.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 095373e..9c7e2ba 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
 2017-08-30  H.J. Lu  <hongjiu.lu@intel.com>
 
+       * elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Check
+       target_id instead of elf_machine_code.
+
+2017-08-30  H.J. Lu  <hongjiu.lu@intel.com>
+
        * elf32-i386.c (ELF_DYNAMIC_INTERPRETER): Removed.
        (elf_i386_lazy_plt_layout): Likewise.
        (elf_i386_non_lazy_plt_layout): Likewise.

diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index ccd6e10..d040ee3 100644 (file)
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -278,7 +278,7 @@ _bfd_x86_elf_link_hash_table_create (bfd *abfd)
     {
       ret->r_info = elf32_r_info;
       ret->r_sym = elf32_r_sym;
-      if (bed->elf_machine_code == EM_X86_64)
+      if (bed->target_id == X86_64_ELF_DATA)
        {
          ret->pointer_r_type = R_X86_64_32;
          ret->dynamic_interpreter = ELFX32_DYNAMIC_INTERPRETER;