From 2ce641c5c4a4abcf1b9d570b63ec974620adb2d3 Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Thu, 8 Jun 2006 13:10:51 +0000 Subject: [PATCH] * elf64-sparc.c (sparc64_elf_adjust_dynamic_symbol): When linking a non-shared object, do not reserve space in .plt and .rela.plt for regular symbols neither defined nor referenced in shared objects. This is a backport of rev. 1.101 (sourceware.org repository) to Binutils 2.15 which fixes the creation of bogus relocations in the PLT of Firefox and Thunderbird binaries and which in turn caused them to segfault in rtld(1). This is committed to the vendor branch as it doesn't represent a local change but the original vendor fix is from after elf_link_hash_flags was replaced with bitfields. PR: sparc64/89486 Approved by: maintainer timeout Obtained from: NetBSD MFC after: 1 week --- contrib/binutils/bfd/elf64-sparc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/binutils/bfd/elf64-sparc.c b/contrib/binutils/bfd/elf64-sparc.c index 4568a22d643..90de3b974d5 100644 --- a/contrib/binutils/bfd/elf64-sparc.c +++ b/contrib/binutils/bfd/elf64-sparc.c @@ -1638,7 +1638,11 @@ sparc64_elf_adjust_dynamic_symbol (info, h) || h->root.type == bfd_link_hash_defweak) && (h->root.u.def.section->flags & SEC_CODE) != 0)) { - if (! elf_hash_table (info)->dynamic_sections_created) + if (! info->shared + && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0 + && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0 + && h->root.type != bfd_link_hash_undefweak + && h->root.type != bfd_link_hash_undefined) { /* This case can occur if we saw a WPLT30 reloc in an input file, but none of the input files were dynamic objects.