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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3ae5c9f0b78d299f585211557792a7b5a48edc6e..75e1e38dfbba3b680f4d5f1bb22949cb440b1fe4 100644 (file)
--- 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 c995ef563f3a3aeb1074bbe7c827b25aaec23bb5..e07a81fb592332ea47c7aebd6b2d0bc0176d02ff 100644 (file)
--- 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 6f9bc36894a726057a3c10c34fd8ba2be4af3810..7c455f2d843b8d3aa5a5bd6948aea1b9085fd85c 100644 (file)
--- 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;