14 files changed, 94 insertions, 7 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index fc606d1da8a..bdf657f65fd 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2009-06-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-ifunc/ifunc-2-x86-64.d: Pass --64 to as and -melf_x86_64 to
+	ld.
+	* ld-ifunc/ifunc-5a-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-5b-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-6a-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-6b-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-7a-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-7b-x86-64.d: Likewise.
+
+	* ld-ifunc/ifunc-8a-i386.s: New.
+	* ld-ifunc/ifunc-8a-x86-64.s: Likewise.
+	* ld-ifunc/ifunc-8b-i386.s: Likewise.
+	* ld-ifunc/ifunc-8b-x86-64.s: Likewise.
+	* ld-ifunc/ifunc-8-i386.d: Likewise.
+	* ld-ifunc/ifunc-8-x86-64.d: Likewise.
+
 2009-06-02  Richard Sandiford  <r.sandiford@uk.ibm.com>
 
 	* ld-powerpc/aix-glink-3.s, ld-powerpc/aix-glink-3a.s,
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
index 103db78cf48..fa8710254d0 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
@@ -1,4 +1,5 @@
-#ld: -shared
+#as: --64
+#ld: -shared -melf_x86_64
 #objdump: -dw
 #target: x86_64-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
index b635099b409..46f41863bc8 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
@@ -1,5 +1,6 @@
 #source: ifunc-5-x86-64.s
-#ld:
+#as: --64
+#ld: -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
index d8b2e913a70..02aff6b7c85 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
@@ -1,5 +1,6 @@
 #source: ifunc-5-x86-64.s
-#ld: -shared -z nocombreloc
+#as: --64
+#ld: -melf_x86_64 -shared -z nocombreloc
 #readelf: -r --wide
 #target: x86_64-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
index 169cf1c40a7..cc3ff94d5ee 100644
--- a/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
@@ -1,5 +1,6 @@
 #source: ifunc-6-x86-64.s
-#ld:
+#as: --64
+#ld: -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
index 5a948e9ca7f..16ccfd7cfd1 100644
--- a/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
@@ -1,5 +1,6 @@
 #source: ifunc-6-x86-64.s
-#ld: -shared -z nocombreloc
+#as: --64
+#ld: -melf_x86_64 -shared -z nocombreloc
 #readelf: -r --wide
 #target: x86_64-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
index 350614ab5ab..25444019693 100644
--- a/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
@@ -1,5 +1,6 @@
 #source: ifunc-7-x86-64.s
-#ld:
+#as: --64
+#ld: -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
index cd66d58d2d5..846fe34e89f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
@@ -1,5 +1,6 @@
 #source: ifunc-7-x86-64.s
-#ld: -shared
+#as: --64
+#ld: -melf_x86_64 -shared
 #readelf: -r --wide
 #target: x86_64-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-8-i386.d b/ld/testsuite/ld-ifunc/ifunc-8-i386.d
new file mode 100644
index 00000000000..e40a9e6dc91
--- /dev/null
+++ b/ld/testsuite/ld-ifunc/ifunc-8-i386.d
@@ -0,0 +1,10 @@
+#source: ifunc-8a-i386.s
+#source: ifunc-8b-i386.s
+#ld: -m elf_i386
+#as: --32
+#readelf: -r --wide
+#target: x86_64-*-* i?86-*-*
+
+Relocation section '.rel.plt' at .*
+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_IRELATIVE[ ]*
diff --git a/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d
new file mode 100644
index 00000000000..ad6a5ddfacc
--- /dev/null
+++ b/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d
@@ -0,0 +1,10 @@
+#source: ifunc-8a-x86-64.s
+#source: ifunc-8b-x86-64.s
+#as: --64
+#ld: -melf_x86_64
+#readelf: -r --wide
+#target: x86_64-*-*
+
+Relocation section '.rela.plt' at .*
+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_IRELATIVE[ ]+[0-9a-f]*
diff --git a/ld/testsuite/ld-ifunc/ifunc-8a-i386.s b/ld/testsuite/ld-ifunc/ifunc-8a-i386.s
new file mode 100644
index 00000000000..9d42d0ea021
--- /dev/null
+++ b/ld/testsuite/ld-ifunc/ifunc-8a-i386.s
@@ -0,0 +1,16 @@
+	.text
+	.type start,"function"
+	.global start
+start:
+	.type _start,"function"
+	.global _start
+_start:
+	.type __start,"function"
+	.global __start
+__start:
+	.type __start,"function"
+	call	.L6
+.L6:
+	popl	%ebx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-.L6], %ebx
+	mov	foo@GOT(%ebx), %eax
diff --git a/ld/testsuite/ld-ifunc/ifunc-8a-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-8a-x86-64.s
new file mode 100644
index 00000000000..8137a07659c
--- /dev/null
+++ b/ld/testsuite/ld-ifunc/ifunc-8a-x86-64.s
@@ -0,0 +1,12 @@
+	.text
+	.type start,"function"
+	.global start
+start:
+	.type _start,"function"
+	.global _start
+_start:
+	.type __start,"function"
+	.global __start
+__start:
+	.type __start,"function"
+	movq    foo@GOTPCREL(%rip), %rax
diff --git a/ld/testsuite/ld-ifunc/ifunc-8b-i386.s b/ld/testsuite/ld-ifunc/ifunc-8b-i386.s
new file mode 100644
index 00000000000..1f108f8e806
--- /dev/null
+++ b/ld/testsuite/ld-ifunc/ifunc-8b-i386.s
@@ -0,0 +1,7 @@
+	.text
+	.type foo, %gnu_indirect_function
+.globl foo
+	.type	foo, @function
+foo:
+	ret
+	.size	foo, .-foo
diff --git a/ld/testsuite/ld-ifunc/ifunc-8b-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-8b-x86-64.s
new file mode 100644
index 00000000000..1f108f8e806
--- /dev/null
+++ b/ld/testsuite/ld-ifunc/ifunc-8b-x86-64.s
@@ -0,0 +1,7 @@
+	.text
+	.type foo, %gnu_indirect_function
+.globl foo
+	.type	foo, @function
+foo:
+	ret
+	.size	foo, .-foo