aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf64-s390.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 36a048a..6a552c7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2020-11-23 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/26918
+ * elf64-s390.c (elf_s390_finish_dynamic_sections): Set .got
+ sh_entsize only if .got size > 0.
+
2020-11-21 Nelson Chu <nelson.chu@sifive.com>
* elfnn-riscv.c (_bfd_riscv_relax_section): Add a new relax pass
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index 41b19bc..d6a46b1 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -3547,7 +3547,7 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
bfd_put_64 (output_bfd, (bfd_vma) 0,
htab->elf.hgot->root.u.def.section->contents + 16);
}
- if (elf_section_data (htab->elf.splt->output_section) != NULL)
+ if (htab->elf.sgot != NULL && htab->elf.sgot->size > 0)
elf_section_data (htab->elf.sgot->output_section)
->this_hdr.sh_entsize = 8;
}