From 3f65f59941a8cf0895384bc4700f41a2f37e1ff2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 1 Sep 2012 02:50:14 +0000 Subject: [PATCH] Don't optimize relocation against _DYNAMIC bfd/ * elf32-i386.c (elf_i386_convert_mov_to_lea): Don't optimize _DYNAMIC. * elf64-x86-64.c (elf_x86_64_convert_mov_to_lea): Likewise. ld/testsuite/ * ld-i386/i386.exp: Run mov1a, mov1b. * ld-x86-64/x86-64.exp: Run mov1a, mov1b, mov1c, mov1d. * ld-i386/mov1.s: New file. * ld-i386/mov1a.d: Likewise. * ld-i386/mov1b.d: Likewise. * ld-x86-64/mov1.s: Likewise. * ld-x86-64/mov1a.d: Likewise. * ld-x86-64/mov1b.d: Likewise. * ld-x86-64/mov1c.d: Likewise. * ld-x86-64/mov1d.d: Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-i386.c | 4 +++- bfd/elf64-x86-64.c | 5 ++++- ld/testsuite/ChangeLog | 14 ++++++++++++++ ld/testsuite/ld-i386/i386.exp | 2 ++ ld/testsuite/ld-i386/mov1.s | 6 ++++++ ld/testsuite/ld-i386/mov1a.d | 13 +++++++++++++ ld/testsuite/ld-i386/mov1b.d | 13 +++++++++++++ ld/testsuite/ld-x86-64/mov1.s | 6 ++++++ ld/testsuite/ld-x86-64/mov1a.d | 13 +++++++++++++ ld/testsuite/ld-x86-64/mov1b.d | 13 +++++++++++++ ld/testsuite/ld-x86-64/mov1c.d | 13 +++++++++++++ ld/testsuite/ld-x86-64/mov1d.d | 13 +++++++++++++ ld/testsuite/ld-x86-64/x86-64.exp | 4 ++++ 14 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 ld/testsuite/ld-i386/mov1.s create mode 100644 ld/testsuite/ld-i386/mov1a.d create mode 100644 ld/testsuite/ld-i386/mov1b.d create mode 100644 ld/testsuite/ld-x86-64/mov1.s create mode 100644 ld/testsuite/ld-x86-64/mov1a.d create mode 100644 ld/testsuite/ld-x86-64/mov1b.d create mode 100644 ld/testsuite/ld-x86-64/mov1c.d create mode 100644 ld/testsuite/ld-x86-64/mov1d.d diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 71933e6..d545c1d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,11 @@ 2012-08-31 H.J. Lu + * elf32-i386.c (elf_i386_convert_mov_to_lea): Don't optimize + _DYNAMIC. + * elf64-x86-64.c (elf_x86_64_convert_mov_to_lea): Likewise. + +2012-08-31 H.J. Lu + * 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 diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index c9bc694..eab963c 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2631,9 +2631,11 @@ elf_i386_convert_mov_to_lea (bfd *abfd, asection *sec, || h->root.type == bfd_link_hash_warning) h = (struct elf_link_hash_entry *) h->root.u.i.link; - /* STT_GNU_IFUNC must keep R_386_GOT32 relocation. */ + /* STT_GNU_IFUNC must keep R_386_GOT32 relocation. We also avoid + optimizing _DYNAMIC since ld.so may use its link-time address. */ if (h->def_regular && h->type != STT_GNU_IFUNC + && strcmp (h->root.root.string, "_DYNAMIC") != 0 && SYMBOL_REFERENCES_LOCAL (link_info, h) && bfd_get_8 (input_bfd, contents + irel->r_offset - 2) == 0x8b) diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 0c37cd3..9edc5ae 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2667,9 +2667,12 @@ elf_x86_64_convert_mov_to_lea (bfd *abfd, asection *sec, || h->root.type == bfd_link_hash_warning) h = (struct elf_link_hash_entry *) h->root.u.i.link; - /* STT_GNU_IFUNC must keep R_X86_64_GOTPCREL relocation. */ + /* STT_GNU_IFUNC must keep R_X86_64_GOTPCREL relocation. We also + avoid optimizing _DYNAMIC since ld.so may use its link-time + address. */ if (h->def_regular && h->type != STT_GNU_IFUNC + && strcmp (h->root.root.string, "_DYNAMIC") != 0 && SYMBOL_REFERENCES_LOCAL (link_info, h) && bfd_get_8 (input_bfd, contents + irel->r_offset - 2) == 0x8b) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 35740cc..dc9223d 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,5 +1,19 @@ 2012-08-31 H.J. Lu + * ld-i386/i386.exp: Run mov1a, mov1b. + * ld-x86-64/x86-64.exp: Run mov1a, mov1b, mov1c, mov1d. + + * ld-i386/mov1.s: New file. + * ld-i386/mov1a.d: Likewise. + * ld-i386/mov1b.d: Likewise. + * ld-x86-64/mov1.s: Likewise. + * ld-x86-64/mov1a.d: Likewise. + * ld-x86-64/mov1b.d: Likewise. + * ld-x86-64/mov1c.d: Likewise. + * ld-x86-64/mov1d.d: Likewise. + +2012-08-31 H.J. Lu + * ld-i386/i386.exp: Run lea1d, lea1f, lea1f. * ld-x86-64/x86-64.exp: Run lea1g, lea1h, lea1i, lea1j, lea1k, lea1l. diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index adb852e..f5835ac 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -239,6 +239,8 @@ run_dump_test "lea1c" run_dump_test "lea1d" run_dump_test "lea1e" run_dump_test "lea1f" +run_dump_test "mov1a" +run_dump_test "mov1b" if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/mov1.s b/ld/testsuite/ld-i386/mov1.s new file mode 100644 index 0000000..c813e71 --- /dev/null +++ b/ld/testsuite/ld-i386/mov1.s @@ -0,0 +1,6 @@ + .text + .globl _start + .type _start, @function +_start: + movl _DYNAMIC@GOT(%ecx), %eax + .size _start, .-_start diff --git a/ld/testsuite/ld-i386/mov1a.d b/ld/testsuite/ld-i386/mov1a.d new file mode 100644 index 0000000..d8ce6b8 --- /dev/null +++ b/ld/testsuite/ld-i386/mov1a.d @@ -0,0 +1,13 @@ +#source: mov1.s +#as: --32 +#ld: -shared -melf_i386 +#objdump: -dw + +.*: +file format .* + + +Disassembly of section .text: + +#... +[ ]*[a-f0-9]+: 8b 81 ([0-9a-f]{2} ){4} * mov -0x[a-f0-9]+\(%ecx\),%eax +#pass diff --git a/ld/testsuite/ld-i386/mov1b.d b/ld/testsuite/ld-i386/mov1b.d new file mode 100644 index 0000000..583dfc8 --- /dev/null +++ b/ld/testsuite/ld-i386/mov1b.d @@ -0,0 +1,13 @@ +#source: mov1.s +#as: --32 +#ld: -pie -melf_i386 +#objdump: -dw + +.*: +file format .* + + +Disassembly of section .text: + +#... +[ ]*[a-f0-9]+: 8b 81 ([0-9a-f]{2} ){4} * mov -0x[a-f0-9]+\(%ecx\),%eax +#pass diff --git a/ld/testsuite/ld-x86-64/mov1.s b/ld/testsuite/ld-x86-64/mov1.s new file mode 100644 index 0000000..2a11b7a --- /dev/null +++ b/ld/testsuite/ld-x86-64/mov1.s @@ -0,0 +1,6 @@ + .text + .globl _start + .type _start, @function +_start: + movq _DYNAMIC@GOTPCREL(%rip), %rax + .size _start, .-_start diff --git a/ld/testsuite/ld-x86-64/mov1a.d b/ld/testsuite/ld-x86-64/mov1a.d new file mode 100644 index 0000000..df156be --- /dev/null +++ b/ld/testsuite/ld-x86-64/mov1a.d @@ -0,0 +1,13 @@ +#source: mov1.s +#as: --64 +#ld: -shared -melf_x86_64 +#objdump: -dw + +.*: +file format .* + + +Disassembly of section .text: + +#... +[ ]*[a-f0-9]+: 48 8b 05 ([0-9a-f]{2} ){4} * mov 0x[a-f0-9]+\(%rip\),%rax # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+> +#pass diff --git a/ld/testsuite/ld-x86-64/mov1b.d b/ld/testsuite/ld-x86-64/mov1b.d new file mode 100644 index 0000000..2f2f6f5 --- /dev/null +++ b/ld/testsuite/ld-x86-64/mov1b.d @@ -0,0 +1,13 @@ +#source: mov1.s +#as: --64 +#ld: -pie -melf_x86_64 +#objdump: -dw + +.*: +file format .* + + +Disassembly of section .text: + +#... +[ ]*[a-f0-9]+: 48 8b 05 ([0-9a-f]{2} ){4} * mov 0x[a-f0-9]+\(%rip\),%rax # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+> +#pass diff --git a/ld/testsuite/ld-x86-64/mov1c.d b/ld/testsuite/ld-x86-64/mov1c.d new file mode 100644 index 0000000..a57e1c1 --- /dev/null +++ b/ld/testsuite/ld-x86-64/mov1c.d @@ -0,0 +1,13 @@ +#source: mov1.s +#as: --x32 +#ld: -shared -melf32_x86_64 +#objdump: -dw + +.*: +file format .* + + +Disassembly of section .text: + +#... +[ ]*[a-f0-9]+: 48 8b 05 ([0-9a-f]{2} ){4} * mov 0x[a-f0-9]+\(%rip\),%rax # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+> +#pass diff --git a/ld/testsuite/ld-x86-64/mov1d.d b/ld/testsuite/ld-x86-64/mov1d.d new file mode 100644 index 0000000..955d33e --- /dev/null +++ b/ld/testsuite/ld-x86-64/mov1d.d @@ -0,0 +1,13 @@ +#source: mov1.s +#as: --x32 +#ld: -pie -melf32_x86_64 +#objdump: -dw + +.*: +file format .* + + +Disassembly of section .text: + +#... +[ ]*[a-f0-9]+: 48 8b 05 ([0-9a-f]{2} ){4} * mov 0x[a-f0-9]+\(%rip\),%rax # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+> +#pass diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 7eabf39..1ad54e6 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -288,6 +288,10 @@ run_dump_test "lea1i" run_dump_test "lea1j" run_dump_test "lea1k" run_dump_test "lea1l" +run_dump_test "mov1a" +run_dump_test "mov1b" +run_dump_test "mov1c" +run_dump_test "mov1d" # Must be native with the C compiler if { [isnative] && [which $CC] != 0 } { -- 2.7.4