From caa65211bbbfd53c40c9ce1b79b97ccf2c679a52 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 22 Oct 2015 04:53:04 -0700 Subject: Add "-z call-nop=PADDING" option to ld The ld linker can transform indirect call to a locally defined function, foo, via its GOT slot, to either "NOP call foo" or "call foo NOP" where NOP is a 1-byte NOP padding. This patch adds a "-z call-nop=PADDING" option to x86 ld to control 1-byte NOP padding for x86 call instruction. PADDING is one of prefix-addr, prefix-nop, suffix-nop, prefix-NUMBER or suffix-NUMBER. bfd/ * elf32-i386.c (elf_i386_convert_load): Use call_nop_byte and check call_nop_as_suffix for 1-byte NOP padding to pad call. * elf64-x86-64.c (elf_x86_64_convert_load): Likewise. include/ * bfdlink.h (bfd_link_info): Add call_nop_as_suffix and call_nop_byte. ld/ * ld/ld.texinfo: Document "-z call-nop=PADDING" option. * emulparams/call_nop.sh: New file. * emulparams/elf_i386_be.sh: Source ${srcdir}/emulparams/call_nop.sh. * emulparams/elf_i386_chaos.sh: Likewise. * emulparams/elf_i386_ldso.sh: Likewise. * emulparams/elf_i386_vxworks.sh: Likewise. * emulparams/elf_iamcu.sh: Likewise. * emulparams/elf_k1om.sh: Likewise. * emulparams/elf_l1om.sh: Likewise. * emulparams/elf_x86_64.sh: Likewise. * emultempl/elf32.em (gld${EMULATION_NAME}_before_parse): Set link_info.call_nop_byte if $CALL_NOP_BYTE isn't empty. ld/testsuite/ * ld-i386/call3.s: New file. * ld-i386/call3a.d: Likewise. * ld-i386/call3b.d: Likewise. * ld-i386/call3c.d: Likewise. * ld-i386/call3d.d: Likewise. * ld-i386/call3e.d: Likewise. * ld-i386/call3f.d: Likewise. * ld-i386/call3g.d: Likewise. * ld-i386/call3h.d: Likewise. * ld-i386/load1-nacl.d: Likewise. * ld-x86-64/call1.s: Likewise. * ld-x86-64/call1a.d: Likewise. * ld-x86-64/call1b.d: Likewise. * ld-x86-64/call1c.d: Likewise. * ld-x86-64/call1d.d: Likewise. * ld-x86-64/call1e.d: Likewise. * ld-x86-64/call1f.d: Likewise. * ld-x86-64/call1g.d: Likewise. * ld-x86-64/call1h.d: Likewise. * ld-x86-64/call1i.d: Likewise. * ld-x86-64/load1a-nacl.d: Likewise. * ld-x86-64/load1b-nacl.d: Likewise. * ld-x86-64/load1c-nacl.d: Likewise. * ld-x86-64/load1d-nacl.d: Likewise. --- ld/testsuite/ld-i386/load1-nacl.d | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 ld/testsuite/ld-i386/load1-nacl.d (limited to 'ld/testsuite/ld-i386/load1-nacl.d') diff --git a/ld/testsuite/ld-i386/load1-nacl.d b/ld/testsuite/ld-i386/load1-nacl.d new file mode 100644 index 0000000..1245639 --- /dev/null +++ b/ld/testsuite/ld-i386/load1-nacl.d @@ -0,0 +1,59 @@ +#source: load1.s +#as: --32 +#ld: -melf_i386 +#objdump: -dw --sym +#target: i?86-*-nacl* x86_64-*-nacl* + +.*: +file format .* + +SYMBOL TABLE: +#... +10030080 l O .data 0+1 bar +#... +10030081 g O .data 0+1 foo +#... + +Disassembly of section .text: + +0+20000 <_start>: +[ ]*[a-f0-9]+: 8d 05 80 00 03 10 lea 0x10030080,%eax +[ ]*[a-f0-9]+: 81 d0 80 00 03 10 adc \$0x10030080,%eax +[ ]*[a-f0-9]+: 81 c3 80 00 03 10 add \$0x10030080,%ebx +[ ]*[a-f0-9]+: 81 e1 80 00 03 10 and \$0x10030080,%ecx +[ ]*[a-f0-9]+: 81 fa 80 00 03 10 cmp \$0x10030080,%edx +[ ]*[a-f0-9]+: 81 cf 80 00 03 10 or \$0x10030080,%edi +[ ]*[a-f0-9]+: 81 de 80 00 03 10 sbb \$0x10030080,%esi +[ ]*[a-f0-9]+: 81 ed 80 00 03 10 sub \$0x10030080,%ebp +[ ]*[a-f0-9]+: 81 f4 80 00 03 10 xor \$0x10030080,%esp +[ ]*[a-f0-9]+: f7 c1 80 00 03 10 test \$0x10030080,%ecx +[ ]*[a-f0-9]+: 8d 05 80 00 03 10 lea 0x10030080,%eax +[ ]*[a-f0-9]+: 81 d0 80 00 03 10 adc \$0x10030080,%eax +[ ]*[a-f0-9]+: 81 c3 80 00 03 10 add \$0x10030080,%ebx +[ ]*[a-f0-9]+: 81 e1 80 00 03 10 and \$0x10030080,%ecx +[ ]*[a-f0-9]+: 81 fa 80 00 03 10 cmp \$0x10030080,%edx +[ ]*[a-f0-9]+: 81 cf 80 00 03 10 or \$0x10030080,%edi +[ ]*[a-f0-9]+: 81 de 80 00 03 10 sbb \$0x10030080,%esi +[ ]*[a-f0-9]+: 81 ed 80 00 03 10 sub \$0x10030080,%ebp +[ ]*[a-f0-9]+: 81 f4 80 00 03 10 xor \$0x10030080,%esp +[ ]*[a-f0-9]+: f7 c1 80 00 03 10 test \$0x10030080,%ecx +[ ]*[a-f0-9]+: 8d 05 81 00 03 10 lea 0x10030081,%eax +[ ]*[a-f0-9]+: 81 d0 81 00 03 10 adc \$0x10030081,%eax +[ ]*[a-f0-9]+: 81 c3 81 00 03 10 add \$0x10030081,%ebx +[ ]*[a-f0-9]+: 81 e1 81 00 03 10 and \$0x10030081,%ecx +[ ]*[a-f0-9]+: 81 fa 81 00 03 10 cmp \$0x10030081,%edx +[ ]*[a-f0-9]+: 81 cf 81 00 03 10 or \$0x10030081,%edi +[ ]*[a-f0-9]+: 81 de 81 00 03 10 sbb \$0x10030081,%esi +[ ]*[a-f0-9]+: 81 ed 81 00 03 10 sub \$0x10030081,%ebp +[ ]*[a-f0-9]+: 81 f4 81 00 03 10 xor \$0x10030081,%esp +[ ]*[a-f0-9]+: f7 c1 81 00 03 10 test \$0x10030081,%ecx +[ ]*[a-f0-9]+: 8d 05 81 00 03 10 lea 0x10030081,%eax +[ ]*[a-f0-9]+: 81 d0 81 00 03 10 adc \$0x10030081,%eax +[ ]*[a-f0-9]+: 81 c3 81 00 03 10 add \$0x10030081,%ebx +[ ]*[a-f0-9]+: 81 e1 81 00 03 10 and \$0x10030081,%ecx +[ ]*[a-f0-9]+: 81 fa 81 00 03 10 cmp \$0x10030081,%edx +[ ]*[a-f0-9]+: 81 cf 81 00 03 10 or \$0x10030081,%edi +[ ]*[a-f0-9]+: 81 de 81 00 03 10 sbb \$0x10030081,%esi +[ ]*[a-f0-9]+: 81 ed 81 00 03 10 sub \$0x10030081,%ebp +[ ]*[a-f0-9]+: 81 f4 81 00 03 10 xor \$0x10030081,%esp +[ ]*[a-f0-9]+: f7 c1 81 00 03 10 test \$0x10030081,%ecx +#pass -- cgit v1.1