This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH, committed] Also check GOT PLT for R_X86_64_PLTOFF64
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: binutils at sourceware dot org
- Date: Mon, 14 Nov 2016 10:18:43 -0800
- Subject: [PATCH, committed] Also check GOT PLT for R_X86_64_PLTOFF64
- Authentication-results: sourceware.org; auth=none
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Since "-z now" replaces PLT with GOT PLT, we should also check GOT PLT
for R_X86_64_PLTOFF64 relocation.
bfd/
PR ld/20800
* elf64-x86-64.c (elf_x86_64_relocate_section): Also check
plt_got.offset for R_X86_64_PLTOFF64.
ld/
PR ld/20800
* testsuite/ld-x86-64/pr20800a.S: New file.
* testsuite/ld-x86-64/pr20800b.S: Likewise.
* testsuite/ld-x86-64/x86-64.exp: Run PR ld/20800 test.
---
bfd/ChangeLog | 6 ++++++
bfd/elf64-x86-64.c | 11 +++++++++--
ld/ChangeLog | 7 +++++++
ld/testsuite/ld-x86-64/pr20800a.S | 17 +++++++++++++++++
ld/testsuite/ld-x86-64/pr20800b.S | 21 +++++++++++++++++++++
ld/testsuite/ld-x86-64/x86-64.exp | 8 ++++++++
6 files changed, 68 insertions(+), 2 deletions(-)
create mode 100644 ld/testsuite/ld-x86-64/pr20800a.S
create mode 100644 ld/testsuite/ld-x86-64/pr20800b.S
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 521e319..b8ae634 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/20800
+ * elf64-x86-64.c (elf_x86_64_relocate_section): Also check
+ plt_got.offset for R_X86_64_PLTOFF64.
+
2016-11-14 Nick Clifton <nickc@redhat.com>
* coffcode.h (coff_slurp_symbol_table): Fix typo: Faal -> Fall.
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 76f09bd..05a4776 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -4693,10 +4693,17 @@ do_ifunc_pointer:
symbols it's the symbol itself relative to GOT. */
if (h != NULL
/* See PLT32 handling. */
- && h->plt.offset != (bfd_vma) -1
+ && (h->plt.offset != (bfd_vma) -1
+ || eh->plt_got.offset != (bfd_vma) -1)
&& htab->elf.splt != NULL)
{
- if (htab->plt_bnd != NULL)
+ if (eh->plt_got.offset != (bfd_vma) -1)
+ {
+ /* Use the GOT PLT. */
+ resolved_plt = htab->plt_got;
+ plt_offset = eh->plt_got.offset;
+ }
+ else if (htab->plt_bnd != NULL)
{
resolved_plt = htab->plt_bnd;
plt_offset = eh->plt_bnd.offset;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index e027201..f0f6694 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2016-11-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/20800
+ * testsuite/ld-x86-64/pr20800a.S: New file.
+ * testsuite/ld-x86-64/pr20800b.S: Likewise.
+ * testsuite/ld-x86-64/x86-64.exp: Run PR ld/20800 test.
+
2016-11-14 Nick Clifton <nickc@redhat.com>
* lexsup.c (parse_args): Add break at end of default case.
diff --git a/ld/testsuite/ld-x86-64/pr20800a.S b/ld/testsuite/ld-x86-64/pr20800a.S
new file mode 100644
index 0000000..c4bcd80
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr20800a.S
@@ -0,0 +1,17 @@
+ .text
+ .globl main
+ .type main, @function
+main:
+.L2:
+ leaq .L2(%rip), %rax
+ movabsq $_GLOBAL_OFFSET_TABLE_-.L2, %r11
+ movabsq $bar@PLTOFF, %rdx
+ pushq %r15
+ addq %r11, %rax
+ movq %rax, %r15
+ addq %rax, %rdx
+ call *%rdx
+ xorl %eax, %eax
+ popq %r15
+ ret
+ .size main, .-main
diff --git a/ld/testsuite/ld-x86-64/pr20800b.S b/ld/testsuite/ld-x86-64/pr20800b.S
new file mode 100644
index 0000000..c4eeb4f
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr20800b.S
@@ -0,0 +1,21 @@
+ .section .rodata.str1.1,"aMS",@progbits,1
+.LC0:
+ .string "PASS\n"
+ .text
+ .globl bar
+ .type bar, @function
+bar:
+.L2:
+ leaq .L2(%rip), %rdx
+ movabsq $_GLOBAL_OFFSET_TABLE_-.L2, %r11
+ movabsq $.LC0@GOTOFF, %rax
+ pushq %r15
+ movabsq $printf@PLTOFF, %rcx
+ addq %r11, %rdx
+ popq %r15
+ leaq (%rdx,%rax), %rdi
+ addq %rdx, %rcx
+ xorl %eax, %eax
+ jmp *%rcx
+ .size bar, .-bar
+ .section .note.GNU-stack,"",@progbits
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index c84bdf1..9a4bdb9 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -991,6 +991,14 @@ if { [isnative] && [which $CC] != 0 } {
"plt-main.out" \
"-fPIC" \
] \
+ [list \
+ "Run pr20800" \
+ "-pie -z now" \
+ "" \
+ { pr20800a.S pr20800b.S } \
+ "pr20800" \
+ "pass.out" \
+ ] \
]
}
--
2.7.4