aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-05-22 07:41:16 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-05-22 07:41:16 -0700
commit25f94347373b1b6f4bfc79eeb38e79d383195779 (patch)
tree2ac9eea2116088b1c8e7bf8a778dd7c5dafc319a
parent9a6465c207ed4e34be92741316d78fc00f0836e4 (diff)
downloadfsf-binutils-gdb-25f94347373b1b6f4bfc79eeb38e79d383195779.zip
fsf-binutils-gdb-25f94347373b1b6f4bfc79eeb38e79d383195779.tar.gz
fsf-binutils-gdb-25f94347373b1b6f4bfc79eeb38e79d383195779.tar.bz2
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.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf64-x86-64.c3
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,