diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-04-26 15:34:00 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-04-26 15:34:00 -0700 |
| commit | 97d343d40012b1030f1fd219f91efcab180fb3ef (patch) | |
| tree | cde57d6b3f72a3b262066a0588833f2b8082599c /bfd | |
| parent | 04b31182bf3f8a1a76e995bdfaaaab4c009b9cb2 (diff) | |
| download | gdb-97d343d40012b1030f1fd219f91efcab180fb3ef.zip gdb-97d343d40012b1030f1fd219f91efcab180fb3ef.tar.gz gdb-97d343d40012b1030f1fd219f91efcab180fb3ef.tar.bz2 | |
x86: Add DT_PLTRELSZ/DT_PLTREL/DT_JMPREL for PLT relocation
x86, PLT relocation may contain R_386_TLS_DESC or R_X86_64_TLSDESC
even though there is no real PLT. We need to add DT_PLTRELSZ, DT_PLTREL
and DT_JMPREL if there is a .rel.plt/.rela.plt section.
bfd/
* elf32-i386.c (elf_i386_size_dynamic_sections): Alwasys add
DT_PLTRELSZ, DT_PLTREL and DT_JMPREL for .rel.plt section.
* elf64-x86-64.c (elf_x86_64_size_dynamic_sections): Alwasys
add DT_PLTRELSZ, DT_PLTREL and DT_JMPREL for .rela.plt section.
ld/
* testsuite/ld-i386/tlsdesc2.d: New test.
* testsuite/ld-x86-64/tlsdesc2.d: Likewise.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 14 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 22 |
3 files changed, 25 insertions, 18 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 26b3572..3234230 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2017-04-26 H.J. Lu <hongjiu.lu@intel.com> + + * elf32-i386.c (elf_i386_size_dynamic_sections): Alwasys add + DT_PLTRELSZ, DT_PLTREL and DT_JMPREL for .rel.plt section. + * elf64-x86-64.c (elf_x86_64_size_dynamic_sections): Alwasys + add DT_PLTRELSZ, DT_PLTREL and DT_JMPREL for .rela.plt section. + 2017-04-26 Nick Clifton <nickc@redhat.com> PR binutils/21434 diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 9a568ce..78c5d5b 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -3577,14 +3577,14 @@ elf_i386_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) relocation. */ if (!add_dynamic_entry (DT_PLTGOT, 0)) return FALSE; + } - if (htab->elf.srelplt->size != 0) - { - if (!add_dynamic_entry (DT_PLTRELSZ, 0) - || !add_dynamic_entry (DT_PLTREL, DT_REL) - || !add_dynamic_entry (DT_JMPREL, 0)) - return FALSE; - } + if (htab->elf.srelplt->size != 0) + { + if (!add_dynamic_entry (DT_PLTRELSZ, 0) + || !add_dynamic_entry (DT_PLTREL, DT_REL) + || !add_dynamic_entry (DT_JMPREL, 0)) + return FALSE; } if (relocs) diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 965ceb2..0e0a020 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -4052,21 +4052,21 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd, relocation. */ if (!add_dynamic_entry (DT_PLTGOT, 0)) return FALSE; + } - if (htab->elf.srelplt->size != 0) - { - if (!add_dynamic_entry (DT_PLTRELSZ, 0) - || !add_dynamic_entry (DT_PLTREL, DT_RELA) - || !add_dynamic_entry (DT_JMPREL, 0)) - return FALSE; - } - - if (htab->tlsdesc_plt - && (!add_dynamic_entry (DT_TLSDESC_PLT, 0) - || !add_dynamic_entry (DT_TLSDESC_GOT, 0))) + if (htab->elf.srelplt->size != 0) + { + if (!add_dynamic_entry (DT_PLTRELSZ, 0) + || !add_dynamic_entry (DT_PLTREL, DT_RELA) + || !add_dynamic_entry (DT_JMPREL, 0)) return FALSE; } + if (htab->tlsdesc_plt + && (!add_dynamic_entry (DT_TLSDESC_PLT, 0) + || !add_dynamic_entry (DT_TLSDESC_GOT, 0))) + return FALSE; + if (relocs) { if (!add_dynamic_entry (DT_RELA, 0) |