diff options
| author | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2017-07-28 17:59:25 +0200 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2017-07-28 18:26:25 +0200 |
| commit | 79c12faeea57e61364b6a7a3e411b096edce989c (patch) | |
| tree | 66333b8892e6dccfd68a4f07953242e6c5183da1 /bfd/elf64-s390.c | |
| parent | 2b94abd48aef2d91bae1c35c8c10ebfb8757247d (diff) | |
S/390: Fix segfault when linking -shared -nostartfiles
Regression-tested on s390x.
bfd/ChangeLog:
2017-07-28 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* elf32-s390.c (elf_s390_finish_dynamic_sections): Add NULL
pointer check for htab->elf.irelplt.
* elf64-s390.c (elf_s390_finish_dynamic_sections): Likewise.
Diffstat (limited to 'bfd/elf64-s390.c')
| -rw-r--r-- | bfd/elf64-s390.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index 62e3cca06c..8c5b1970d5 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -3745,7 +3745,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd, break; case DT_PLTRELSZ: - dyn.d_un.d_val = htab->elf.srelplt->size + htab->elf.irelplt->size; + dyn.d_un.d_val = htab->elf.srelplt->size; + if (htab->elf.irelplt) + dyn.d_un.d_val += htab->elf.irelplt->size; break; case DT_RELASZ: @@ -3756,7 +3758,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd, linker script arranges for .rela.plt to follow all other relocation sections, we don't have to worry about changing the DT_RELA entry. */ - dyn.d_un.d_val -= htab->elf.srelplt->size + htab->elf.irelplt->size; + dyn.d_un.d_val -= htab->elf.srelplt->size; + if (htab->elf.irelplt) + dyn.d_un.d_val -= htab->elf.irelplt->size; break; } |