Convert mov to lea in size_dynamic_sections

bfd/

	* elf32-i386.c (elf_i386_convert_mov_to_lea): New.
	(elf_i386_size_dynamic_sections): Use it on input sections.
	(elf_i386_relocate_section): Don't convert
	"mov foo@GOT(%reg), %reg" to "lea foo@GOTOFF(%reg), %reg"
	for local symbols here.

	* elf64-x86-64.c (elf_x86_64_convert_mov_to_lea): New.
	(elf_x86_64_size_dynamic_sections): Use it on input sections.
	(elf_x86_64_relocate_section): Don't convert
	"mov foo@GOTPCREL(%rip), %reg" to "lea foo@GOTOFF(%reg), %reg"
	for local symbols.

ld/testsuite/

	* ld-i386/i386.exp: Run lea1d, lea1f, lea1f.
	* ld-x86-64/x86-64.exp: Run lea1g, lea1h, lea1i, lea1j, lea1k,
	lea1l.

	* ld-ifunc/ifunc-13-i386.d: Remove R_386_RELATIVE entry.

	* ld-i386/lea1d.d: New file.
	* ld-i386/lea1e.d: Likewise.
	* ld-i386/lea1f.d: Likewise.
	* ld-x86-64/lea1g.d: Likewise.
	* ld-x86-64/lea1h.d: Likewise.
	* ld-x86-64/lea1i.d: Likewise.
	* ld-x86-64/lea1j.d: Likewise.
	* ld-x86-64/lea1k.d: Likewise.
	* ld-x86-64/lea1l.d: Likewise.

13 files changed, 108 insertions, 4 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index bab65e4..35740cc 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2012-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-i386/i386.exp: Run lea1d, lea1f, lea1f.
+	* ld-x86-64/x86-64.exp: Run lea1g, lea1h, lea1i, lea1j, lea1k,
+	lea1l.
+
+	* ld-ifunc/ifunc-13-i386.d: Remove R_386_RELATIVE entry.
+
+	* ld-i386/lea1d.d: New file.
+	* ld-i386/lea1e.d: Likewise.
+	* ld-i386/lea1f.d: Likewise.
+	* ld-x86-64/lea1g.d: Likewise.
+	* ld-x86-64/lea1h.d: Likewise.
+	* ld-x86-64/lea1i.d: Likewise.
+	* ld-x86-64/lea1j.d: Likewise.
+	* ld-x86-64/lea1k.d: Likewise.
+	* ld-x86-64/lea1l.d: Likewise.
+
 2012-08-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld-i386/i386.exp: Run lea1a, lea1b, lea1c.
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index b7e8042..adb852e 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -236,6 +236,9 @@ run_dump_test "pr12570b"
 run_dump_test "lea1a"
 run_dump_test "lea1b"
 run_dump_test "lea1c"
+run_dump_test "lea1d"
+run_dump_test "lea1e"
+run_dump_test "lea1f"
 
 if { !([istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
diff --git a/ld/testsuite/ld-i386/lea1d.d b/ld/testsuite/ld-i386/lea1d.d
new file mode 100644
index 0000000..7deab26
--- /dev/null
+++ b/ld/testsuite/ld-i386/lea1d.d
@@ -0,0 +1,9 @@
+#source: lea1.s
+#as: --32
+#ld: -Bsymbolic -shared -melf_i386
+#readelf: -Sw
+
+#failif
+#...
+[ 	]*\[.*\][ 	]+.*\.got .*
+#...
diff --git a/ld/testsuite/ld-i386/lea1e.d b/ld/testsuite/ld-i386/lea1e.d
new file mode 100644
index 0000000..ae66958
--- /dev/null
+++ b/ld/testsuite/ld-i386/lea1e.d
@@ -0,0 +1,9 @@
+#source: lea1.s
+#as: --32
+#ld: -pie -melf_i386
+#readelf: -Sw
+
+#failif
+#...
+[ 	]*\[.*\][ 	]+.*\.got .*
+#...
diff --git a/ld/testsuite/ld-i386/lea1f.d b/ld/testsuite/ld-i386/lea1f.d
new file mode 100644
index 0000000..3c16996
--- /dev/null
+++ b/ld/testsuite/ld-i386/lea1f.d
@@ -0,0 +1,9 @@
+#source: lea1.s
+#as: --32
+#ld: -melf_i386
+#readelf: -Sw
+
+#failif
+#...
+[ 	]*\[.*\][ 	]+.*\.got .*
+#...
diff --git a/ld/testsuite/ld-ifunc/ifunc-13-i386.d b/ld/testsuite/ld-ifunc/ifunc-13-i386.d
index 55cca22..746945b 100644
--- a/ld/testsuite/ld-ifunc/ifunc-13-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-13-i386.d
@@ -5,10 +5,6 @@
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
 
-Relocation section '.rel.got' at offset 0x[0-9a-f]+ contains 1 entries:
-[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
-[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_RELATIVE[ ]+
-
 Relocation section '.rel.ifunc' at offset 0x[0-9a-f]+ contains 1 entries:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
 [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_32[ ]+ifunc\(\)[ ]+ifunc
diff --git a/ld/testsuite/ld-x86-64/lea1g.d b/ld/testsuite/ld-x86-64/lea1g.d
new file mode 100644
index 0000000..df0abd8
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/lea1g.d
@@ -0,0 +1,9 @@
+#source: lea1.s
+#as: --64
+#ld: -Bsymbolic -shared -melf_x86_64
+#readelf: -Sw
+
+#failif
+#...
+[ 	]*\[.*\][ 	]+.*\.got .*
+#...
diff --git a/ld/testsuite/ld-x86-64/lea1h.d b/ld/testsuite/ld-x86-64/lea1h.d
new file mode 100644
index 0000000..3c9860b
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/lea1h.d
@@ -0,0 +1,9 @@
+#source: lea1.s
+#as: --64
+#ld: -pie -melf_x86_64
+#readelf: -Sw
+
+#failif
+#...
+[ 	]*\[.*\][ 	]+.*\.got .*
+#...
diff --git a/ld/testsuite/ld-x86-64/lea1i.d b/ld/testsuite/ld-x86-64/lea1i.d
new file mode 100644
index 0000000..9a91a10
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/lea1i.d
@@ -0,0 +1,9 @@
+#source: lea1.s
+#as: --64
+#ld: -melf_x86_64
+#readelf: -Sw
+
+#failif
+#...
+[ 	]*\[.*\][ 	]+.*\.got .*
+#...
diff --git a/ld/testsuite/ld-x86-64/lea1j.d b/ld/testsuite/ld-x86-64/lea1j.d
new file mode 100644
index 0000000..a8cfc19
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/lea1j.d
@@ -0,0 +1,9 @@
+#source: lea1.s
+#as: --x32
+#ld: -Bsymbolic -shared -melf32_x86_64
+#readelf: -Sw
+
+#failif
+#...
+[ 	]*\[.*\][ 	]+.*\.got .*
+#...
diff --git a/ld/testsuite/ld-x86-64/lea1k.d b/ld/testsuite/ld-x86-64/lea1k.d
new file mode 100644
index 0000000..bb02506
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/lea1k.d
@@ -0,0 +1,9 @@
+#source: lea1.s
+#as: --x32
+#ld: -pie -melf32_x86_64
+#readelf: -Sw
+
+#failif
+#...
+[ 	]*\[.*\][ 	]+.*\.got .*
+#...
diff --git a/ld/testsuite/ld-x86-64/lea1l.d b/ld/testsuite/ld-x86-64/lea1l.d
new file mode 100644
index 0000000..1df2bc1
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/lea1l.d
@@ -0,0 +1,9 @@
+#source: lea1.s
+#as: --x32
+#ld: -melf32_x86_64
+#readelf: -Sw
+
+#failif
+#...
+[ 	]*\[.*\][ 	]+.*\.got .*
+#...
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 1db81c8..7eabf39 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -282,6 +282,12 @@ run_dump_test "lea1c"
 run_dump_test "lea1d"
 run_dump_test "lea1e"
 run_dump_test "lea1f"
+run_dump_test "lea1g"
+run_dump_test "lea1h"
+run_dump_test "lea1i"
+run_dump_test "lea1j"
+run_dump_test "lea1k"
+run_dump_test "lea1l"
 
 # Must be native with the C compiler
 if { [isnative] && [which $CC] != 0 } {