espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 03:29:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

mips: Check UNDEFWEAK_NO_DYNAMIC_RELOC

Browse Source 
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
	* elfxx-mips.c (mips_elf_calculate_relocation): Don't generate
	dynamic relocation if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
	(allocate_dynrelocs): Don't allocate dynamic relocations if
	UNDEFWEAK_NO_DYNAMIC_RELOC is true.
This commit is contained in:
H.J. Lu
2017-10-14 10:52:12 -07:00
parent 95b03e4ad6
commit ad95120309
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2017-10-14 H.J. Lu <hongjiu.lu@intel.com>
PR ld/22269
* elfxx-mips.c (mips_elf_calculate_relocation): Don't generate
dynamic relocation if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
(allocate_dynrelocs): Don't allocate dynamic relocations if
UNDEFWEAK_NO_DYNAMIC_RELOC is true.
2017-10-14 H.J. Lu <hongjiu.lu@intel.com> 2017-10-14 H.J. Lu <hongjiu.lu@intel.com>
PR ld/22269 PR ld/22269

11
bfd/elfxx-mips.c
View File

@ -5310,6 +5310,7 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
bfd_boolean target_is_micromips_code_p = FALSE; bfd_boolean target_is_micromips_code_p = FALSE;
struct mips_elf_link_hash_table *htab; struct mips_elf_link_hash_table *htab;
bfd *dynobj; bfd *dynobj;
bfd_boolean resolved_to_zero;
dynobj = elf_hash_table (info)->dynobj; dynobj = elf_hash_table (info)->dynobj;
htab = mips_elf_hash_table (info); htab = mips_elf_hash_table (info);
@ -5665,6 +5666,10 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
addend = 0; addend = 0;
} }
resolved_to_zero = (h != NULL
&& UNDEFWEAK_NO_DYNAMIC_RELOC (info,
&h->root));
/* If we haven't already determined the GOT offset, and we're going /* If we haven't already determined the GOT offset, and we're going
to need it, get it now. */ to need it, get it now. */
switch (r_type) switch (r_type)
@ -5796,7 +5801,8 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
&& r_symndx != STN_UNDEF && r_symndx != STN_UNDEF
&& (h == NULL && (h == NULL
|| h->root.root.type != bfd_link_hash_undefweak || h->root.root.type != bfd_link_hash_undefweak
|| ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT) || (ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT
&& !resolved_to_zero))
&& (input_section->flags & SEC_ALLOC) != 0) && (input_section->flags & SEC_ALLOC) != 0)
{ {
/* If we're creating a shared library, then we can't know /* If we're creating a shared library, then we can't know
@ -8940,7 +8946,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
{ {
/* Do not copy relocations for undefined weak symbols with /* Do not copy relocations for undefined weak symbols with
non-default visibility. */ non-default visibility. */
if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT) if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|| UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
do_copy = FALSE; do_copy = FALSE;
/* Make sure undefined weak symbols are output as a dynamic /* Make sure undefined weak symbols are output as a dynamic