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

s390: 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
	* elf32-s390.c (allocate_dynrelocs): Discard dynamic
	relocations if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
	(elf_s390_relocate_section): Don't generate dynamic relocation
	if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
	* elf64-s390.c (allocate_dynrelocs): Discard dynamic
	relocations if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
	(elf_s390_relocate_section): Don't generate dynamic relocation
	if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
This commit is contained in:
H.J. Lu
2017-10-14 11:06:00 -07:00
parent 31a53da541
commit b27bb18f45
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bfd/ChangeLog
View File

@ -1,3 +1,15 @@
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
if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
* elf64-s390.c (allocate_dynrelocs): Discard dynamic
relocations if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
(elf_s390_relocate_section): Don't generate dynamic relocation
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

10
bfd/elf32-s390.c
View File

@ -1947,7 +1947,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
if (eh->dyn_relocs != NULL if (eh->dyn_relocs != NULL
&& h->root.type == bfd_link_hash_undefweak) && 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; eh->dyn_relocs = NULL;
/* Make sure undefined weak symbols are output as a dynamic /* Make sure undefined weak symbols are output as a dynamic
@ -2357,6 +2358,7 @@ elf_s390_relocate_section (bfd *output_bfd,
bfd_reloc_status_type r; bfd_reloc_status_type r;
int tls_type; int tls_type;
asection *base_got = htab->elf.sgot; asection *base_got = htab->elf.sgot;
bfd_boolean resolved_to_zero;
r_type = ELF32_R_TYPE (rel->r_info); r_type = ELF32_R_TYPE (rel->r_info);
if (r_type == (int) R_390_GNU_VTINHERIT if (r_type == (int) R_390_GNU_VTINHERIT
@ -2448,6 +2450,9 @@ elf_s390_relocate_section (bfd *output_bfd,
if (bfd_link_relocatable (info)) if (bfd_link_relocatable (info))
continue; continue;
resolved_to_zero = (h != NULL
&& UNDEFWEAK_NO_DYNAMIC_RELOC (info, h));
switch (r_type) switch (r_type)
{ {
case R_390_GOTPLT12: case R_390_GOTPLT12:
@ -2836,7 +2841,8 @@ elf_s390_relocate_section (bfd *output_bfd,
if ((bfd_link_pic (info) if ((bfd_link_pic (info)
&& (h == NULL && (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) || h->root.type != bfd_link_hash_undefweak)
&& ((r_type != R_390_PC16 && ((r_type != R_390_PC16
&& r_type != R_390_PC12DBL && r_type != R_390_PC12DBL

10
bfd/elf64-s390.c
View File

@ -1890,7 +1890,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
if (eh->dyn_relocs != NULL if (eh->dyn_relocs != NULL
&& h->root.type == bfd_link_hash_undefweak) && 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; eh->dyn_relocs = NULL;
/* Make sure undefined weak symbols are output as a dynamic /* Make sure undefined weak symbols are output as a dynamic
@ -2307,6 +2308,7 @@ elf_s390_relocate_section (bfd *output_bfd,
bfd_reloc_status_type r; bfd_reloc_status_type r;
int tls_type; int tls_type;
asection *base_got = htab->elf.sgot; asection *base_got = htab->elf.sgot;
bfd_boolean resolved_to_zero;
r_type = ELF64_R_TYPE (rel->r_info); r_type = ELF64_R_TYPE (rel->r_info);
if (r_type == (int) R_390_GNU_VTINHERIT if (r_type == (int) R_390_GNU_VTINHERIT
@ -2402,6 +2404,9 @@ elf_s390_relocate_section (bfd *output_bfd,
if (bfd_link_relocatable (info)) if (bfd_link_relocatable (info))
continue; continue;
resolved_to_zero = (h != NULL
&& UNDEFWEAK_NO_DYNAMIC_RELOC (info, h));
switch (r_type) switch (r_type)
{ {
case R_390_GOTPLT12: case R_390_GOTPLT12:
@ -2804,7 +2809,8 @@ elf_s390_relocate_section (bfd *output_bfd,
if ((bfd_link_pic (info) if ((bfd_link_pic (info)
&& (h == NULL && (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) || h->root.type != bfd_link_hash_undefweak)
&& ((r_type != R_390_PC16 && ((r_type != R_390_PC16
&& r_type != R_390_PC12DBL && r_type != R_390_PC12DBL