From f04bdfa7b261402bfa9dbdde58b2feb14becd8a3 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 2 Sep 2017 22:14:58 -0700 Subject: [PATCH] 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. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-x86.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e3a479e70f1..4190878c66d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2017-09-02 H.J. Lu + + * 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 * configure.ac (bfd_backends): Add elf64-x86-64.lo together diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index 874799ea025..cac451d2084 100644 --- 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 { -- 2.30.2