From 49314f8728c7d2fcfcaa20771bf7a453901db081 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 31 Jul 2008 07:27:52 +0000 Subject: [PATCH] 2008-07-31 Takashi Ono * pe-dll.c (generate_relocs): Don't generate relocs for undefined weak symbols. --- ld/ChangeLog | 5 +++++ ld/pe-dll.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index 6388638e04..e6d84b3462 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2008-07-31 Takashi Ono + + * pe-dll.c (generate_relocs): Don't generate relocs for + undefined weak symbols. + 2008-07-31 Jan Kratochvil * emultempl/spuelf.em: Abort on the missing required `spu_ovl.o'. diff --git a/ld/pe-dll.c b/ld/pe-dll.c index 692f80fdbe..c6c656a230 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -1256,6 +1256,16 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info) bfd_vma sym_vma; struct bfd_symbol *sym = *relocs[i]->sym_ptr_ptr; + /* Don't create relocs for undefined weak symbols. */ + if (sym->flags == BSF_WEAK) + { + struct bfd_link_hash_entry *blhe + = bfd_link_hash_lookup (info->hash, sym->name, + FALSE, FALSE, FALSE); + if (!blhe || blhe->type != bfd_link_hash_defined) + continue; + } + sym_vma = (relocs[i]->addend + sym->value + sym->section->vma