This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] sh: Check UNDEFWEAK_NO_DYNAMIC_RELOC
- From: H.J.Lu <hjl at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 14 Oct 2017 18:10:14 -0000
- Subject: [binutils-gdb] sh: Check UNDEFWEAK_NO_DYNAMIC_RELOC
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6ee6e05af482b356f9be4b0db877802fb47b2a12
commit 6ee6e05af482b356f9be4b0db877802fb47b2a12
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Oct 14 11:07:18 2017 -0700
sh: Check UNDEFWEAK_NO_DYNAMIC_RELOC
Don't generate dynamic relocation against weak undefined symbol if it
is resolved to zero. FIXME: UNDEFWEAK_NO_DYNAMIC_RELOC may need to be
checked in more places.
PR ld/22269
* elf32-sh.c (allocate_dynrelocs): Discard dynamic relocations
if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
(sh_elf_relocate_section): Don't generate dynamic relocation if
UNDEFWEAK_NO_DYNAMIC_RELOC is true.
Diff:
---
bfd/ChangeLog | 8 ++++++++
bfd/elf32-sh.c | 13 +++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 096e560..fc1d0f5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,14 @@
2017-10-14 H.J. Lu <hongjiu.lu@intel.com>
PR ld/22269
+ * elf32-sh.c (allocate_dynrelocs): Discard dynamic relocations
+ if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
+ (sh_elf_relocate_section): Don't generate dynamic relocation if
+ UNDEFWEAK_NO_DYNAMIC_RELOC is true.
+
+2017-10-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/22269
* elf32-s390.c (allocate_dynrelocs): Discard dynamic
relocations if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
(elf_s390_relocate_section): Don't generate dynamic relocation
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 6ce34fe..3960427 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -3221,7 +3221,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
if (eh->dyn_relocs != NULL
&& h->root.type == bfd_link_hash_undefweak)
{
- if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+ if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+ || UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
eh->dyn_relocs = NULL;
/* Make sure undefined weak symbols are output as a dynamic
@@ -3894,6 +3895,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
bfd_vma off;
enum got_type got_type;
const char *symname = NULL;
+ bfd_boolean resolved_to_zero;
r_symndx = ELF32_R_SYM (rel->r_info);
@@ -3933,6 +3935,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
if (! howto->partial_inplace)
addend = rel->r_addend;
+ resolved_to_zero = FALSE;
h = NULL;
sym = NULL;
sec = NULL;
@@ -4141,7 +4144,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
}
}
else if (h->root.type == bfd_link_hash_undefweak)
- ;
+ resolved_to_zero = UNDEFWEAK_NO_DYNAMIC_RELOC (info, h);
else if (info->unresolved_syms_in_objects == RM_IGNORE
&& ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
;
@@ -4309,7 +4312,8 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
#endif
if (bfd_link_pic (info)
&& (h == NULL
- || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+ || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+ && !resolved_to_zero)
|| h->root.type != bfd_link_hash_undefweak)
&& r_symndx != STN_UNDEF
&& (input_section->flags & SEC_ALLOC) != 0
@@ -4537,7 +4541,8 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
h)
|| (bfd_link_pic (info)
&& SYMBOL_REFERENCES_LOCAL (info, h))
- || (ELF_ST_VISIBILITY (h->other)
+ || ((ELF_ST_VISIBILITY (h->other)
+ || resolved_to_zero)
&& h->root.type == bfd_link_hash_undefweak))
{
/* This is actually a static link, or it is a