From b27bb18f45a99330600ab57892c3620343425910 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sat, 14 Oct 2017 11:06:00 -0700
Subject: [PATCH] s390: 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-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.
---
bfd/ChangeLog | 12 ++++++++++++
bfd/elf32-s390.c | 10 ++++++++--
bfd/elf64-s390.c | 10 ++++++++--
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 21a01a1f109..096e5600851 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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>
PR ld/22269
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index 81e1a9df130..eaf2bf14c01 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -1947,7 +1947,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
@@ -2357,6 +2358,7 @@ elf_s390_relocate_section (bfd *output_bfd,
bfd_reloc_status_type r;
int tls_type;
asection *base_got = htab->elf.sgot;
+ bfd_boolean resolved_to_zero;
r_type = ELF32_R_TYPE (rel->r_info);
if (r_type == (int) R_390_GNU_VTINHERIT
@@ -2448,6 +2450,9 @@ elf_s390_relocate_section (bfd *output_bfd,
if (bfd_link_relocatable (info))
continue;
+ resolved_to_zero = (h != NULL
+ && UNDEFWEAK_NO_DYNAMIC_RELOC (info, h));
+
switch (r_type)
{
case R_390_GOTPLT12:
@@ -2836,7 +2841,8 @@ elf_s390_relocate_section (bfd *output_bfd,
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_type != R_390_PC16
&& r_type != R_390_PC12DBL
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index 73d0331f8e4..c12688027bf 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -1890,7 +1890,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
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
@@ -2307,6 +2308,7 @@ elf_s390_relocate_section (bfd *output_bfd,
bfd_reloc_status_type r;
int tls_type;
asection *base_got = htab->elf.sgot;
+ bfd_boolean resolved_to_zero;
r_type = ELF64_R_TYPE (rel->r_info);
if (r_type == (int) R_390_GNU_VTINHERIT
@@ -2402,6 +2404,9 @@ elf_s390_relocate_section (bfd *output_bfd,
if (bfd_link_relocatable (info))
continue;
+ resolved_to_zero = (h != NULL
+ && UNDEFWEAK_NO_DYNAMIC_RELOC (info, h));
+
switch (r_type)
{
case R_390_GOTPLT12:
@@ -2804,7 +2809,8 @@ elf_s390_relocate_section (bfd *output_bfd,
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_type != R_390_PC16
&& r_type != R_390_PC12DBL