From 9d734efa1034d266249751978f95a686ec9d19c6 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 14 Nov 2016 10:13:03 -0800
Subject: Also check GOT PLT for R_X86_64_PLTOFF64

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.
---
 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 ++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 ld/testsuite/ld-x86-64/pr20800a.S
 create mode 100644 ld/testsuite/ld-x86-64/pr20800b.S

(limited to 'ld/testsuite')

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" \
+	    ] \
 	]
     }
 
-- 
cgit v1.1