diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2016-05-20 09:36:48 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2016-05-20 09:36:48 -0700 |
| commit | 52bf37dd91e5dd983ed20d1329293d077fe71e41 (patch) | |
| tree | e01de60acda8b2d765e362630f4c5706d25e0833 /bfd | |
| parent | a4968f42e78972fa10b1a84a5e72afd4b65b0eca (diff) | |
| download | binutils-52bf37dd91e5dd983ed20d1329293d077fe71e41.zip binutils-52bf37dd91e5dd983ed20d1329293d077fe71e41.tar.gz binutils-52bf37dd91e5dd983ed20d1329293d077fe71e41.tar.bz2 | |
Don't check R_386_GOT32 when setting need_convert_load
Since we no longer convert R_386_GOT32, don't check R_386_GOT32 when
setting need_convert_load.
* elf32-i386.c (elf_i386_check_relocs): Don't check R_386_GOT32
when setting need_convert_load.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1a9eeb6..45dbbe4 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-05-20 H.J. Lu <hongjiu.lu@intel.com> + + * elf32-i386.c (elf_i386_check_relocs): Don't check R_386_GOT32 + when setting need_convert_load. + 2016-05-20 Maciej W. Rozycki <macro@imgtec.com> * elfxx-mips.c (mips_elf_read_rel_addend): Adjust the addend for diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index c7e08aa..8766d2b 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2256,7 +2256,7 @@ do_size: goto error_return; } - if ((r_type == R_386_GOT32 || r_type == R_386_GOT32X) + if (r_type == R_386_GOT32X && (h == NULL || h->type != STT_GNU_IFUNC)) sec->need_convert_load = 1; } |