From 7d04a20ae4af0f1f6e75ec642413c27de4c1e1b8 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 7 Oct 2019 13:21:02 +1030 Subject: [PATCH] PowerPC TLS miscounting PLT for __tls_get_addr ppc*_elf_tls_optimize decrements the PLT refcount for __tls_get_addr when a GD or LD sequence can be optimized. Without tls marker relocs this must be done when processing the argument setup relocations. With marker relocs it's better done when processing the marker reloc. But don't count them both ways. Seen as "unresolvable R_PPC_REL24 relocation against symbol `__tls_get_addr_opt'" (and other branch relocs). * elf32-ppc.c (ppc_elf_tls_optimize): Don't process R_PPC_TLSLD with non-local symbol. Don't double count __tls_get_addr calls with marker relocs. * elf64-ppc.c (ppc64_elf_tls_optimize): Likewise. --- bfd/ChangeLog | 7 +++++++ bfd/elf32-ppc.c | 12 +++++++----- bfd/elf64-ppc.c | 7 +++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9f3489920b6..b691d585712 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2019-10-07 Alan Modra + + * elf32-ppc.c (ppc_elf_tls_optimize): Don't process R_PPC_TLSLD + with non-local symbol. Don't double count __tls_get_addr calls + with marker relocs. + * elf64-ppc.c (ppc64_elf_tls_optimize): Likewise. + 2019-10-07 Alan Modra * elf32-ppc.c (nomark_tls_get_addr): Rename from has_tls_get_addr_call diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index d5c3ae9d0b7..cb6cd114af3 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -4530,8 +4530,11 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, else continue; - case R_PPC_TLSGD: case R_PPC_TLSLD: + if (!is_local) + continue; + /* Fall through. */ + case R_PPC_TLSGD: if (rel + 1 < relend && is_plt_seq_reloc (ELF32_R_TYPE (rel[1].r_info))) { @@ -4633,7 +4636,7 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, != (TLS_TLS | TLS_MARK))) continue; - if (expecting_tls_get_addr) + if (expecting_tls_get_addr == 1 + !sec->nomark_tls_get_addr) { struct plt_entry *ent; bfd_vma addend = 0; @@ -4646,10 +4649,9 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, got2, addend); if (ent != NULL && ent->plt.refcount > 0) ent->plt.refcount -= 1; - - if (expecting_tls_get_addr == 2) - continue; } + if (tls_clear == 0) + continue; if (tls_set == 0) { diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 31c86b40278..842fc40f144 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -7906,8 +7906,11 @@ ppc64_elf_tls_optimize (struct bfd_link_info *info) } continue; - case R_PPC64_TLSGD: case R_PPC64_TLSLD: + if (!is_local) + continue; + /* Fall through. */ + case R_PPC64_TLSGD: if (rel + 1 < relend && is_plt_seq_reloc (ELF64_R_TYPE (rel[1].r_info))) { @@ -8092,7 +8095,7 @@ ppc64_elf_tls_optimize (struct bfd_link_info *info) != (TLS_TLS | TLS_MARK))) continue; - if (expecting_tls_get_addr) + if (expecting_tls_get_addr == 1 + !sec->nomark_tls_get_addr) { struct plt_entry *ent = NULL; -- 2.30.2