X86-64: Test external function reference without PLT

To call an external function, the direct branch to the PLT entry can be
replaced by an indirect branch via the GOT slot, which is similar to the
first instruction in the PLT slot.  Instead using the PLT slot as function
address, the function address is retrieved from the GOT slot.  If linker
determines the function is defined locally, it converts indirect branch
via the GOT slot to direct branch with a nop prefix and converts load via
the GOT slot to load immediate or lea,

	* testsuite/ld-x86-64/libno-plt-1b.dd: Likewise.
	* testsuite/ld-x86-64/libno-plt-1b.rd: Likewise.
	* testsuite/ld-x86-64/no-plt-1a.dd: Likewise.
	* testsuite/ld-x86-64/no-plt-1a.rd: Likewise.
	* testsuite/ld-x86-64/no-plt-1b.dd: Likewise.
	* testsuite/ld-x86-64/no-plt-1b.rd: Likewise.
	* testsuite/ld-x86-64/no-plt-1c.dd: Likewise.
	* testsuite/ld-x86-64/no-plt-1c.rd: Likewise.
	* testsuite/ld-x86-64/no-plt-1d.dd: Likewise.
	* testsuite/ld-x86-64/no-plt-1d.rd: Likewise.
	* testsuite/ld-x86-64/no-plt-1e.dd: Likewise.
	* testsuite/ld-x86-64/no-plt-1e.rd: Likewise.
	* testsuite/ld-x86-64/no-plt-1f.dd: Likewise.
	* testsuite/ld-x86-64/no-plt-1f.rd: Likewise.
	* testsuite/ld-x86-64/no-plt-1g.dd: Likewise.
	* testsuite/ld-x86-64/no-plt-1g.rd: Likewise.
	* testsuite/ld-x86-64/no-plt-check1.S: Likewise.
	* testsuite/ld-x86-64/no-plt.exp: Likewise.
	* testsuite/ld-x86-64/no-plt-extern1.S: Likewise.
	* testsuite/ld-x86-64/no-plt-func1.c: Likewise.
	* testsuite/ld-x86-64/no-plt-main1.c: Likewise.

21 files changed, 557 insertions, 0 deletions

diff --git a/ld/testsuite/ld-x86-64/libno-plt-1b.dd b/ld/testsuite/ld-x86-64/libno-plt-1b.dd
new file mode 100644
index 0000000..c58ede4
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/libno-plt-1b.dd
@@ -0,0 +1,15 @@
+#objdump: -dwrj.text
+#target: x86_64-*-*
+
+.*: +file format elf64-x86-64.*
+
+Disassembly of section .text:
+
+#...
+[0-9a-f]+ <get_func>:
+ +[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	c3                   	retq   
+#...
+[0-9a-f]+ <call_func>:
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+#pass
diff --git a/ld/testsuite/ld-x86-64/libno-plt-1b.rd b/ld/testsuite/ld-x86-64/libno-plt-1b.rd
new file mode 100644
index 0000000..fa415fd
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/libno-plt-1b.rd
@@ -0,0 +1,8 @@
+#readelf: -Wr
+#target: x86_64-*-*
+
+Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
+ +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ func \+ 0
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1a.dd b/ld/testsuite/ld-x86-64/no-plt-1a.dd
new file mode 100644
index 0000000..81b62b0
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1a.dd
@@ -0,0 +1,32 @@
+#objdump: -dwrj.text
+#target: x86_64-*-*
+
+.*: +file format elf64-x86-64.*
+
+Disassembly of section .text:
+
+#...
+[0-9a-f]+ <check>:
+ +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <get_func>
+ +[a-f0-9]+:	48 81 f8 ([0-9a-f]{2} ){4}[ 	]+cmp    \$0x[0-9a-f]+,%rax
+ +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <func>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <call_func>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
+ +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+#...
+[0-9a-f]+ <get_func>:
+ +[a-f0-9]+:	48 c7 c0 ([0-9a-f]{2} ){4}[ 	]+mov    \$0x[0-9a-f]+,%rax
+ +[a-f0-9]+:	c3                   	retq   
+#...
+[0-9a-f]+ <call_func>:
+ +[a-f0-9]+:	e9 ([0-9a-f]{2} ){4}[ 	]+jmpq   [a-f0-9]+ <func>
+ +[a-f0-9]+:	90                   	nop
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1a.rd b/ld/testsuite/ld-x86-64/no-plt-1a.rd
new file mode 100644
index 0000000..fd2e008
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1a.rd
@@ -0,0 +1,10 @@
+#readelf: -Wr
+#target: x86_64-*-*
+
+Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
+ +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ abort.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ puts.* \+ 0
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1b.dd b/ld/testsuite/ld-x86-64/no-plt-1b.dd
new file mode 100644
index 0000000..5662a2f
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1b.dd
@@ -0,0 +1,24 @@
+#objdump: -dwrj.text
+#target: x86_64-*-*
+
+.*: +file format elf64-x86-64.*
+
+Disassembly of section .text:
+
+#...
+[0-9a-f]+ <check>:
+ +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
+ +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1b.rd b/ld/testsuite/ld-x86-64/no-plt-1b.rd
new file mode 100644
index 0000000..ab1b1af
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1b.rd
@@ -0,0 +1,16 @@
+#readelf: -Wr
+#target: x86_64-*-*
+
+Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
+ +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ abort.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ puts.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ get_func \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ call_func \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ func \+ 0
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1c.dd b/ld/testsuite/ld-x86-64/no-plt-1c.dd
new file mode 100644
index 0000000..197359e
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1c.dd
@@ -0,0 +1,24 @@
+#objdump: -dwrj.text
+#target: x86_64-*-*
+
+.*: +file format elf64-x86-64.*
+
+Disassembly of section .text:
+
+#...
+[0-9a-f]+ <check>:
+ +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 81 f8 ([0-9a-f]{2} ){4}[ 	]+cmp    \$0x[0-9a-f]+,%rax
+ +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <func>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
+ +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1c.rd b/ld/testsuite/ld-x86-64/no-plt-1c.rd
new file mode 100644
index 0000000..d54913f
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1c.rd
@@ -0,0 +1,14 @@
+#readelf: -Wr
+#target: x86_64-*-*
+
+Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
+ +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ abort.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ puts.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ get_func \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ call_func \+ 0
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1d.dd b/ld/testsuite/ld-x86-64/no-plt-1d.dd
new file mode 100644
index 0000000..375de61
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1d.dd
@@ -0,0 +1,33 @@
+#objdump: -dwrj.text
+#target: x86_64-*-*
+
+.*: +file format elf64-x86-64.*
+
+Disassembly of section .text:
+
+#...
+[0-9a-f]+ <check>:
+ +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <get_func>
+ +[a-f0-9]+:	48 81 f8 ([0-9a-f]{2} ){4}[ 	]+cmp    \$0x[0-9a-f]+,%rax
+ +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <func>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <call_func>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
+ +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
+ +[a-f0-9]+:	e9 ([0-9a-f]{2} ){4}[ 	]+jmpq   [a-f0-9]+ <.*puts.*>
+ +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <abort>
+#...
+[0-9a-f]+ <get_func>:
+ +[a-f0-9]+:	48 c7 c0 ([0-9a-f]{2} ){4}[ 	]+mov    \$0x[0-9a-f]+,%rax
+ +[a-f0-9]+:	c3                   	retq   
+#...
+[0-9a-f]+ <call_func>:
+ +[a-f0-9]+:	e9 ([0-9a-f]{2} ){4}[ 	]+jmpq   [a-f0-9]+ <func>
+ +[a-f0-9]+:	90                   	nop
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1d.rd b/ld/testsuite/ld-x86-64/no-plt-1d.rd
new file mode 100644
index 0000000..814d364
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1d.rd
@@ -0,0 +1,7 @@
+#readelf: -Wr
+#target: x86_64-*-*
+
+#failif
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +.*
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1e.dd b/ld/testsuite/ld-x86-64/no-plt-1e.dd
new file mode 100644
index 0000000..c4b948d
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1e.dd
@@ -0,0 +1,32 @@
+#objdump: -dwrj.text
+#target: x86_64-*-*
+
+.*: +file format elf64-x86-64.*
+
+Disassembly of section .text:
+
+#...
+[0-9a-f]+ <check>:
+ +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <get_func>
+ +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <func>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <call_func>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
+ +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+#...
+[0-9a-f]+ <get_func>:
+ +[a-f0-9]+:	48 8d 05 ([0-9a-f]{2} ){4}[ 	]+lea    -0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <func>
+ +[a-f0-9]+:	c3                   	retq   
+#...
+[0-9a-f]+ <call_func>:
+ +[a-f0-9]+:	e9 ([0-9a-f]{2} ){4}[ 	]+jmpq   [a-f0-9]+ <func>
+ +[a-f0-9]+:	90                   	nop
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1e.rd b/ld/testsuite/ld-x86-64/no-plt-1e.rd
new file mode 100644
index 0000000..fd2e008
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1e.rd
@@ -0,0 +1,10 @@
+#readelf: -Wr
+#target: x86_64-*-*
+
+Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
+ +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ abort.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ puts.* \+ 0
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1f.dd b/ld/testsuite/ld-x86-64/no-plt-1f.dd
new file mode 100644
index 0000000..5662a2f
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1f.dd
@@ -0,0 +1,24 @@
+#objdump: -dwrj.text
+#target: x86_64-*-*
+
+.*: +file format elf64-x86-64.*
+
+Disassembly of section .text:
+
+#...
+[0-9a-f]+ <check>:
+ +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
+ +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1f.rd b/ld/testsuite/ld-x86-64/no-plt-1f.rd
new file mode 100644
index 0000000..ab1b1af
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1f.rd
@@ -0,0 +1,16 @@
+#readelf: -Wr
+#target: x86_64-*-*
+
+Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
+ +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ abort.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ puts.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ get_func \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ call_func \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ func \+ 0
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1g.dd b/ld/testsuite/ld-x86-64/no-plt-1g.dd
new file mode 100644
index 0000000..00ae97b
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1g.dd
@@ -0,0 +1,24 @@
+#objdump: -dwrj.text
+#target: x86_64-*-*
+
+.*: +file format elf64-x86-64.*
+
+Disassembly of section .text:
+
+#...
+[0-9a-f]+ <check>:
+ +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <func>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
+ +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
+ +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1g.rd b/ld/testsuite/ld-x86-64/no-plt-1g.rd
new file mode 100644
index 0000000..d54913f
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-1g.rd
@@ -0,0 +1,14 @@
+#readelf: -Wr
+#target: x86_64-*-*
+
+Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
+ +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ abort.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ puts.* \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ get_func \+ 0
+#...
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ call_func \+ 0
+#pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-check1.S b/ld/testsuite/ld-x86-64/no-plt-check1.S
new file mode 100644
index 0000000..5bacb3f
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-check1.S
@@ -0,0 +1,25 @@
+	.section	.rodata.str1.1,"aMS",@progbits,1
+.LC0:
+	.string	"PASS"
+	.text
+	.p2align 4,,15
+	.globl	check
+	.type	check, @function
+check:
+	subq	$8, %rsp
+	call	*get_func@GOTPCREL(%rip)
+	cmpq	func@GOTPCREL(%rip), %rax
+	jne	.L3
+	call	*func@GOTPCREL(%rip)
+	cmpl	$305419896, %eax
+	jne	.L3
+	call	*call_func@GOTPCREL(%rip)
+	cmpl	$305419896, %eax
+	jne	.L3
+	leaq	.LC0(%rip), %rdi
+	addq	$8, %rsp
+	jmp	*puts@GOTPCREL(%rip)
+.L3:
+	call	*abort@GOTPCREL(%rip)
+	.size	check, .-check
+	.section	.note.GNU-stack,"",@progbits
diff --git a/ld/testsuite/ld-x86-64/no-plt-extern1.S b/ld/testsuite/ld-x86-64/no-plt-extern1.S
new file mode 100644
index 0000000..3957f39
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-extern1.S
@@ -0,0 +1,15 @@
+	.text
+	.p2align 4,,15
+	.globl	get_func
+	.type	get_func, @function
+get_func:
+	movq	func@GOTPCREL(%rip), %rax
+	ret
+	.size	get_func, .-get_func
+	.p2align 4,,15
+	.globl	call_func
+	.type	call_func, @function
+call_func:
+	jmp	*func@GOTPCREL(%rip)
+	.size	call_func, .-call_func
+	.section	.note.GNU-stack,"",@progbits
diff --git a/ld/testsuite/ld-x86-64/no-plt-func1.c b/ld/testsuite/ld-x86-64/no-plt-func1.c
new file mode 100644
index 0000000..ec4040c
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-func1.c
@@ -0,0 +1,5 @@
+int
+func (void)
+{
+  return 0x12345678;
+}
diff --git a/ld/testsuite/ld-x86-64/no-plt-main1.c b/ld/testsuite/ld-x86-64/no-plt-main1.c
new file mode 100644
index 0000000..370275a
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt-main1.c
@@ -0,0 +1,8 @@
+extern void check (void);
+
+int
+main ()
+{
+  check ();
+  return 0;
+}
diff --git a/ld/testsuite/ld-x86-64/no-plt.exp b/ld/testsuite/ld-x86-64/no-plt.exp
new file mode 100644
index 0000000..f57e131
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/no-plt.exp
@@ -0,0 +1,201 @@
+# Expect script for x86-64 no-PLT tests.
+#   Copyright (C) 2016 Free Software Foundation, Inc.
+#
+# This file is part of the GNU Binutils.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+# The following tests require running the executable generated by ld,
+# or enough of a build environment to create a fully linked executable.
+# This is not commonly available when testing a cross-built linker.
+if ![isnative] {
+    return
+}
+
+if ![is_elf_format] {
+    return
+}
+
+if ![istarget "x86_64-*-*"] {
+    return
+}
+
+# Check to see if the C compiler works
+if { [which $CC] == 0 } {
+    return
+}
+
+run_cc_link_tests [list \
+    [list \
+	"Build no-plt-func1.o no-plt-main1.o" \
+	"" \
+	"-fPIE" \
+	{no-plt-func1.c no-plt-main1.c} \
+    ] \
+    [list \
+	"Build no-plt-check1.o no-plt-extern1.o" \
+	"" \
+	"-Wa,-mrelax-relocations=yes" \
+	{no-plt-check1.S no-plt-extern1.S} \
+    ] \
+    [list \
+	"Build libno-plt-1a.so" \
+	"-shared tmpdir/no-plt-func1.o" \
+	"" \
+	{dummy.s} \
+	{} \
+	"libno-plt-1a.so" \
+    ] \
+    [list \
+	"Build libno-plt-1b.so" \
+	"-shared tmpdir/no-plt-extern1.o" \
+	"" \
+	{dummy.s} \
+	{{readelf -Wr libno-plt-1b.rd} \
+	 {objdump -dwrj.text libno-plt-1b.dd}} \
+	"libno-plt-1b.so" \
+    ] \
+    [list \
+	"No PLT (dynamic 1a)" \
+	"tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+	"" \
+	{dummy.s} \
+	{{readelf -Wr no-plt-1a.rd} {objdump -dwrj.text no-plt-1a.dd}} \
+	"no-plt-1a" \
+    ] \
+    [list \
+	"No PLT (dynamic 1b)" \
+	"tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+	"" \
+	{dummy.s} \
+	{{readelf -Wr no-plt-1b.rd} {objdump -dwrj.text no-plt-1b.dd}} \
+	"no-plt-1b" \
+    ] \
+    [list \
+	"No PLT (dynamic 1c)" \
+	"tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+	"" \
+	{dummy.s} \
+	{{readelf -Wr no-plt-1c.rd} {objdump -dwrj.text no-plt-1c.dd}} \
+	"no-plt-1c" \
+    ] \
+    [list \
+	"No PLT (static 1d)" \
+	"-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+	"" \
+	{dummy.s} \
+	{{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
+	"no-plt-1a" \
+    ] \
+    [list \
+	"No PLT (PIE 1e)" \
+	"-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+	"" \
+	{dummy.s} \
+	{{readelf -Wr no-plt-1e.rd} {objdump -dwrj.text no-plt-1e.dd}} \
+	"no-plt-1e" \
+    ] \
+    [list \
+	"No PLT (PIE 1f)" \
+	"-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+	"" \
+	{ dummy.s } \
+	{{readelf -Wr no-plt-1f.rd} {objdump -dwrj.text no-plt-1f.dd}} \
+	"no-plt-1f" \
+    ] \
+    [list \
+	"No PLT (PIE 1g)" \
+	"-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+	"" \
+	{ dummy.s } \
+	{{readelf -Wr no-plt-1g.rd} {objdump -dwrj.text no-plt-1g.dd}} \
+	"no-plt-1g" \
+    ] \
+]
+
+run_ld_link_exec_tests [] [list \
+    [list \
+	"No PLT (dynamic 1a)" \
+	"tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+	"" \
+	{ dummy.s } \
+	"no-plt-1a" \
+	"pass.out" \
+    ] \
+    [list \
+	"No PLT (dynamic 1b)" \
+	"tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+	"" \
+	{ dummy.s } \
+	"no-plt-1b" \
+	"pass.out" \
+    ] \
+    [list \
+	"No PLT (dynamic 1c)" \
+	"tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+	"" \
+	{ dummy.s } \
+	"no-plt-1c" \
+	"pass.out" \
+    ] \
+    [list \
+	"No PLT (static 1d)" \
+	"-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+	"" \
+	{ dummy.s } \
+	"no-plt-1d" \
+	"pass.out" \
+    ] \
+    [list \
+	"No PLT (PIE 1e)" \
+	"-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+	"" \
+	{ dummy.s } \
+	"no-plt-1e" \
+	"pass.out" \
+    ] \
+    [list \
+	"No PLT (PIE 1f)" \
+	"-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+	"" \
+	{ dummy.s } \
+	"no-plt-1f" \
+	"pass.out" \
+    ] \
+    [list \
+	"No PLT (PIE 1g)" \
+	"-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+	"" \
+	{ dummy.s } \
+	"no-plt-1g" \
+	"pass.out" \
+    ] \
+]