diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-10-14 11:04:32 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-10-14 11:04:45 -0700 |
| commit | 31a53da5418528b9ba94bb80a97f0084f40e0c64 (patch) | |
| tree | 831dd2e89ed32accad9618164c16a7c8dcd2b0cc | |
| parent | 112fef4084ff0bdd6dd9aacca85f5fe62e1a5423 (diff) | |
| download | binutils-gdb-31a53da5418528b9ba94bb80a97f0084f40e0c64.tar.gz | |
nios2: 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-nios2.c (nios2_elf32_relocate_section): Don't generate
dynamic relocation if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
(allocate_dynrelocs): Discard dynamic relocations if
UNDEFWEAK_NO_DYNAMIC_RELOC is true.
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/elf32-nios2.c | 16 |
2 files changed, 20 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 44ce307b77e..21a01a1f109 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-nios2.c (nios2_elf32_relocate_section): Don't generate + dynamic relocation if UNDEFWEAK_NO_DYNAMIC_RELOC is true. + (allocate_dynrelocs): Discard dynamic relocations if + UNDEFWEAK_NO_DYNAMIC_RELOC is true. + +2017-10-14 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/22269 * elf32-microblaze.c (microblaze_elf_relocate_section): Don't generate dynamic relocation if UNDEFWEAK_NO_DYNAMIC_RELOC is true. diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c index 860a3d7af50..64e40efbee3 100644 --- a/bfd/elf32-nios2.c +++ b/bfd/elf32-nios2.c @@ -3772,6 +3772,10 @@ nios2_elf32_relocate_section (bfd *output_bfd, if (howto) { + bfd_boolean resolved_to_zero; + + resolved_to_zero = (h != NULL + && UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)); switch (howto->type) { case R_NIOS2_HI16: @@ -4004,7 +4008,8 @@ nios2_elf32_relocate_section (bfd *output_bfd, 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 -Bsymbolic @@ -4258,7 +4263,8 @@ nios2_elf32_relocate_section (bfd *output_bfd, if ((bfd_link_pic (info) || indx != 0) && (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)) { need_relocs = TRUE; @@ -4387,7 +4393,8 @@ nios2_elf32_relocate_section (bfd *output_bfd, if (bfd_link_pic (info) && (input_section->flags & SEC_ALLOC) != 0 && (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)) { Elf_Internal_Rela outrel; @@ -5752,7 +5759,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, PTR 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 |