[binutils-gdb] x86-64: Use dynobj instead of htab->elf.dynobj

[H.J.Lu]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=25f94347373b1b6f4bfc79eeb38e79d383195779

commit 25f94347373b1b6f4bfc79eeb38e79d383195779
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Mon May 22 07:41:16 2017 -0700

    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:
---
 bfd/ChangeLog      | 5 +++++
 bfd/elf64-x86-64.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 38462fe..d788a37 100644
--- 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 00cf70a..7beb78e 100644
--- 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,