From 8aaf083b7fd848934b5f42e594d3bbbb73267950 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 7 Oct 2019 23:14:31 +1030 Subject: [PATCH] Re: PowerPC PIC vs. DLL TLS issues A bug crept into commit f749f26eea, which could cause linker segfaults when creating PIEs. This patch fixes it. * elf64-ppc.c (ppc64_elf_size_dynamic_sections): Do allocate space for local got non-tls relocs when PIE. (cherry picked from commit 93370e8e7b406cf0aeedcf57cf457c07d6a2c7e6) --- bfd/ChangeLog | 4 ++++ bfd/elf64-ppc.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 562aa63..3c0c42b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,6 +1,10 @@ 2019-10-09 Alan Modra Apply from master + 2019-10-07 Alan Modra + * elf64-ppc.c (ppc64_elf_size_dynamic_sections): Do allocate + space for local got non-tls relocs when PIE. + 2019-10-04 Alan Modra * elf64-ppc.c (ppc64_elf_check_relocs): Move initialisation of vars. (ppc64_elf_tls_optimize): Correct is_local condition. diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 144c731..5d6443e 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -9781,7 +9781,9 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd, htab->elf.irelplt->size += rel_size; htab->got_reli_size += rel_size; } - else if (bfd_link_dll (info)) + else if (bfd_link_pic (info) + && !(ent->tls_type != 0 + && bfd_link_executable (info))) { asection *srel = ppc64_elf_tdata (ibfd)->relgot; srel->size += rel_size; -- 2.7.4