Initialize tls_get_addr for x86-64 in one place

	* elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Initialize
	tls_get_addr for x86-64 in one place.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e3a479e70f1bbd5619688f9a78d097b4455b6e74..4190878c66dd9d48ae607b6db8a951905f97c818 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Initialize
+       tls_get_addr for x86-64 in one place.
+
 2017-09-02  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure.ac (bfd_backends): Add elf64-x86-64.lo together

diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 874799ea0253c62175e2da8c1cacb359cc672ac1..cac451d2084b722efe842d8f1076d921f559b848 100644 (file)
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -768,6 +768,7 @@ _bfd_x86_elf_link_hash_table_create (bfd *abfd)
       ret->dt_reloc_sz = DT_RELASZ;
       ret->dt_reloc_ent = DT_RELAENT;
       ret->got_entry_size = 8;
+      ret->tls_get_addr = "__tls_get_addr";
     }
   if (ABI_64_P (abfd))
     {
@@ -777,7 +778,6 @@ _bfd_x86_elf_link_hash_table_create (bfd *abfd)
       ret->pointer_r_type = R_X86_64_64;
       ret->dynamic_interpreter = ELF64_DYNAMIC_INTERPRETER;
       ret->dynamic_interpreter_size = sizeof ELF64_DYNAMIC_INTERPRETER;
-      ret->tls_get_addr = "__tls_get_addr";
     }
   else
 #endif
@@ -791,7 +791,6 @@ _bfd_x86_elf_link_hash_table_create (bfd *abfd)
          ret->dynamic_interpreter = ELFX32_DYNAMIC_INTERPRETER;
          ret->dynamic_interpreter_size
            = sizeof ELFX32_DYNAMIC_INTERPRETER;
-         ret->tls_get_addr = "__tls_get_addr";
        }
       else
        {