From 8701c1bc04f3f34f3bca69411b6c27701bfddb33 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 19 Feb 2001 22:35:47 +0000 Subject: [PATCH] * elf32-sparc.c (elf32_sparc_finish_dynamic_symbol): Don't make PLT entries that could serve as a definition for a weak symbol. * elf64-sparc.c (sparc64_elf_finish_dynamic_symbol): Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-sparc.c | 7 +++++++ bfd/elf64-sparc.c | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 19aabe35d69..1b74b5cb0f9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2001-02-19 Jakub Jelinek + + * elf32-sparc.c (elf32_sparc_finish_dynamic_symbol): Don't make PLT + entries that could serve as a definition for a weak symbol. + * elf64-sparc.c (sparc64_elf_finish_dynamic_symbol): Likewise. + 2001-02-18 David O'Brien * configure.in: Recognize FreeBSD/arm, FreeBSD/PowerPC, and treat diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index e892e9d938d..8b64f199cde 100644 --- a/bfd/elf32-sparc.c +++ b/bfd/elf32-sparc.c @@ -1759,6 +1759,13 @@ elf32_sparc_finish_dynamic_symbol (output_bfd, info, h, sym) /* Mark the symbol as undefined, rather than as defined in the .plt section. Leave the value alone. */ sym->st_shndx = SHN_UNDEF; + /* If the symbol is weak, we do need to clear the value. + Otherwise, the PLT entry would provide a definition for + the symbol even if the symbol wasn't defined anywhere, + and so the symbol would never be NULL. */ + if ((h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR_NONWEAK) + == 0) + sym->st_value = 0; } } diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index 77fc7e269f3..18b6b751547 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -2709,6 +2709,13 @@ sparc64_elf_finish_dynamic_symbol (output_bfd, info, h, sym) /* Mark the symbol as undefined, rather than as defined in the .plt section. Leave the value alone. */ sym->st_shndx = SHN_UNDEF; + /* If the symbol is weak, we do need to clear the value. + Otherwise, the PLT entry would provide a definition for + the symbol even if the symbol wasn't defined anywhere, + and so the symbol would never be NULL. */ + if ((h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR_NONWEAK) + == 0) + sym->st_value = 0; } } -- 2.30.2