x86-64: Use dynobj instead of htab->elf.dynobj

	* elf64-x86-64.c (elf_x86_64_link_setup_gnu_properties): Use
	dynobj instead of htab->elf.dynobj.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 38462fee6f55f4c05199f2e4ecbbf3c8438c94eb..d788a375cb225130c7f6481345fd337fcbd610ed 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf64-x86-64.c (elf_x86_64_link_setup_gnu_properties): Use
+       dynobj instead of htab->elf.dynobj.
+
 2017-05-19  Maciej W. Rozycki  <macro@imgtec.com>
 
        * elf64-mips.c (mips_elf64_canonicalize_reloc): Remove prototype

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 00cf70ad724a443ae9fd0f3a7327c71730cf9953..7beb78e0ab69a38783ad842b16b869d07f5afabd 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -7245,8 +7245,7 @@ error_alignment:
          /* MPX PLT is supported only for non-NaCl target in 64-bit
             mode and is needed only for lazy binding.  */
          if (lazy_plt
-             && info->bndplt
-             && ABI_64_P (htab->elf.dynobj))
+             && info->bndplt && ABI_64_P (dynobj))
            {
              /* Create the second PLT for Intel MPX support.  */
              sec = bfd_make_section_anyway_with_flags (dynobj,