diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 21 |
2 files changed, 13 insertions, 13 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8e9ad82..2a1ae13 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-06-13 H.J. Lu <hongjiu.lu@intel.com> + + * elf32-i386.c (elf_i386_relocate_section): Simplify IFUNC + GOT32 adjustment for static executables. + 2016-06-13 Maciej W. Rozycki <macro@imgtec.com> * elf32-mips.c (elf_mips_gnu_pcrel32): Update comment. diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 7e2b2cb..fbbf4ab 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -4032,21 +4032,16 @@ elf_i386_relocate_section (bfd *output_bfd, } relocation = off; - - /* Adjust for static executables. */ - if (htab->elf.splt == NULL) - relocation += gotplt->output_offset; } else - { - relocation = (base_got->output_section->vma - + base_got->output_offset + off - - gotplt->output_section->vma - - gotplt->output_offset); - /* Adjust for static executables. */ - if (htab->elf.splt == NULL) - relocation += gotplt->output_offset; - } + relocation = (base_got->output_section->vma + + base_got->output_offset + off + - gotplt->output_section->vma + - gotplt->output_offset); + + /* Adjust for static executables. */ + if (htab->elf.splt == NULL) + relocation += gotplt->output_offset; goto do_relocation; |