espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-27 22:48:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

S/390: Fix segfault when linking -shared -nostartfiles

Browse Source 
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.
This commit is contained in:
Andreas Krebbel
2017-07-28 17:59:25 +02:00
parent 2b94abd48a
commit 79c12faeea
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bfd/elf32-s390.c
View File

@ -3941,7 +3941,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
break; break;
case DT_PLTRELSZ: 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; break;
} }

8
bfd/elf64-s390.c
View File

@ -3745,7 +3745,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
break; break;
case DT_PLTRELSZ: 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; break;
case DT_RELASZ: case DT_RELASZ:
@ -3756,7 +3758,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
linker script arranges for .rela.plt to follow all linker script arranges for .rela.plt to follow all
other relocation sections, we don't have to worry other relocation sections, we don't have to worry
about changing the DT_RELA entry. */ 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; break;
} }