mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-07-30 05:14:18 +08:00
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.
This commit is contained in:
bfd
ld/testsuite
@ -1,3 +1,9 @@
|
|||||||
|
2012-08-31 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
|
* 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 <hongjiu.lu@intel.com>
|
2012-08-31 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
* elf32-i386.c (elf_i386_convert_mov_to_lea): New.
|
* elf32-i386.c (elf_i386_convert_mov_to_lea): New.
|
||||||
|
@ -2631,9 +2631,11 @@ elf_i386_convert_mov_to_lea (bfd *abfd, asection *sec,
|
|||||||
|| h->root.type == bfd_link_hash_warning)
|
|| h->root.type == bfd_link_hash_warning)
|
||||||
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
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
|
if (h->def_regular
|
||||||
&& h->type != STT_GNU_IFUNC
|
&& h->type != STT_GNU_IFUNC
|
||||||
|
&& strcmp (h->root.root.string, "_DYNAMIC") != 0
|
||||||
&& SYMBOL_REFERENCES_LOCAL (link_info, h)
|
&& SYMBOL_REFERENCES_LOCAL (link_info, h)
|
||||||
&& bfd_get_8 (input_bfd,
|
&& bfd_get_8 (input_bfd,
|
||||||
contents + irel->r_offset - 2) == 0x8b)
|
contents + irel->r_offset - 2) == 0x8b)
|
||||||
|
@ -2667,9 +2667,12 @@ elf_x86_64_convert_mov_to_lea (bfd *abfd, asection *sec,
|
|||||||
|| h->root.type == bfd_link_hash_warning)
|
|| h->root.type == bfd_link_hash_warning)
|
||||||
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
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
|
if (h->def_regular
|
||||||
&& h->type != STT_GNU_IFUNC
|
&& h->type != STT_GNU_IFUNC
|
||||||
|
&& strcmp (h->root.root.string, "_DYNAMIC") != 0
|
||||||
&& SYMBOL_REFERENCES_LOCAL (link_info, h)
|
&& SYMBOL_REFERENCES_LOCAL (link_info, h)
|
||||||
&& bfd_get_8 (input_bfd,
|
&& bfd_get_8 (input_bfd,
|
||||||
contents + irel->r_offset - 2) == 0x8b)
|
contents + irel->r_offset - 2) == 0x8b)
|
||||||
|
@ -1,3 +1,17 @@
|
|||||||
|
2012-08-31 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
|
* 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 <hongjiu.lu@intel.com>
|
2012-08-31 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
* ld-i386/i386.exp: Run lea1d, lea1f, lea1f.
|
* ld-i386/i386.exp: Run lea1d, lea1f, lea1f.
|
||||||
|
@ -239,6 +239,8 @@ run_dump_test "lea1c"
|
|||||||
run_dump_test "lea1d"
|
run_dump_test "lea1d"
|
||||||
run_dump_test "lea1e"
|
run_dump_test "lea1e"
|
||||||
run_dump_test "lea1f"
|
run_dump_test "lea1f"
|
||||||
|
run_dump_test "mov1a"
|
||||||
|
run_dump_test "mov1b"
|
||||||
|
|
||||||
if { !([istarget "i?86-*-linux*"]
|
if { !([istarget "i?86-*-linux*"]
|
||||||
|| [istarget "i?86-*-gnu*"]
|
|| [istarget "i?86-*-gnu*"]
|
||||||
|
6
ld/testsuite/ld-i386/mov1.s
Normal file
6
ld/testsuite/ld-i386/mov1.s
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
.text
|
||||||
|
.globl _start
|
||||||
|
.type _start, @function
|
||||||
|
_start:
|
||||||
|
movl _DYNAMIC@GOT(%ecx), %eax
|
||||||
|
.size _start, .-_start
|
13
ld/testsuite/ld-i386/mov1a.d
Normal file
13
ld/testsuite/ld-i386/mov1a.d
Normal file
@ -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
|
13
ld/testsuite/ld-i386/mov1b.d
Normal file
13
ld/testsuite/ld-i386/mov1b.d
Normal file
@ -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
|
6
ld/testsuite/ld-x86-64/mov1.s
Normal file
6
ld/testsuite/ld-x86-64/mov1.s
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
.text
|
||||||
|
.globl _start
|
||||||
|
.type _start, @function
|
||||||
|
_start:
|
||||||
|
movq _DYNAMIC@GOTPCREL(%rip), %rax
|
||||||
|
.size _start, .-_start
|
13
ld/testsuite/ld-x86-64/mov1a.d
Normal file
13
ld/testsuite/ld-x86-64/mov1a.d
Normal file
@ -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
|
13
ld/testsuite/ld-x86-64/mov1b.d
Normal file
13
ld/testsuite/ld-x86-64/mov1b.d
Normal file
@ -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
|
13
ld/testsuite/ld-x86-64/mov1c.d
Normal file
13
ld/testsuite/ld-x86-64/mov1c.d
Normal file
@ -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
|
13
ld/testsuite/ld-x86-64/mov1d.d
Normal file
13
ld/testsuite/ld-x86-64/mov1d.d
Normal file
@ -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
|
@ -288,6 +288,10 @@ run_dump_test "lea1i"
|
|||||||
run_dump_test "lea1j"
|
run_dump_test "lea1j"
|
||||||
run_dump_test "lea1k"
|
run_dump_test "lea1k"
|
||||||
run_dump_test "lea1l"
|
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
|
# Must be native with the C compiler
|
||||||
if { [isnative] && [which $CC] != 0 } {
|
if { [isnative] && [which $CC] != 0 } {
|
||||||
|
Reference in New Issue
Block a user