diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-04-28 07:26:45 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-04-28 07:26:45 -0700 |
| commit | 750eaa47f10f48d19aacbec74ab6867da0164677 (patch) | |
| tree | 791959bf4f4aea484db4e169a1f57ba9f590a310 | |
| parent | 4621115fe529869e938dca605bb90190ea52316a (diff) | |
| download | binutils-750eaa47f10f48d19aacbec74ab6867da0164677.zip binutils-750eaa47f10f48d19aacbec74ab6867da0164677.tar.gz binutils-750eaa47f10f48d19aacbec74ab6867da0164677.tar.bz2 | |
x86: Check plt_got before using .plt.got
Since the GOT procedure linkage table is supported only if plt_got
isn't NULL, we need to check plt_got before using it.
* elf32-i386.c (elf_i386_allocate_dynrelocs): Check plt_got
before using .plt.got.
* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 4 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3ae5c9f..75e1e38 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2017-04-28 H.J. Lu <hongjiu.lu@intel.com> + + * elf32-i386.c (elf_i386_allocate_dynrelocs): Check plt_got + before using .plt.got. + * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise. + 2017-04-27 H.J. Lu <hongjiu.lu@intel.com> * elf64-x86-64.c (elf_x86_64_size_dynamic_sections): Use "=" diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index c995ef5..e07a81f 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2727,7 +2727,9 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) if PLT is used. */ eh->func_pointer_refcount = 0; - if ((info->flags & DF_BIND_NOW) && !h->pointer_equality_needed) + if (htab->plt_got != NULL + && (info->flags & DF_BIND_NOW) + && !h->pointer_equality_needed) { /* Don't use the regular PLT for DF_BIND_NOW. */ h->plt.offset = (bfd_vma) -1; diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 6f9bc36..7c455f2 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -3178,7 +3178,9 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) if PLT is used. */ eh->func_pointer_refcount = 0; - if ((info->flags & DF_BIND_NOW) && !h->pointer_equality_needed) + if (htab->plt_got != NULL + && (info->flags & DF_BIND_NOW) + && !h->pointer_equality_needed) { /* Don't use the regular PLT for DF_BIND_NOW. */ h->plt.offset = (bfd_vma) -1; |