From d982ba7301f23611ea22b679d083c90ea640c041 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sun, 11 Mar 2001 13:10:51 +0000 Subject: [PATCH] 2001-03-11 Philip Blundell * elf32-arm.h (elf32_arm_finish_dynamic_symbol): Don't make PLT entries that could serve as a definition for a weak symbol. --- bfd/ChangeLog | 5 +++++ bfd/elf32-arm.h | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 21932c5..136fdab 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2001-03-11 Philip Blundell + + * elf32-arm.h (elf32_arm_finish_dynamic_symbol): Don't make PLT + entries that could serve as a definition for a weak symbol. + 2001-03-08 Nick Clifton * Most files: Update copyright notices using Perl script created diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index 9129b8e..58edefe 100644 --- a/bfd/elf32-arm.h +++ b/bfd/elf32-arm.h @@ -3197,6 +3197,13 @@ elf32_arm_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.7.4