caa65211bb
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.
58 lines
1.6 KiB
Bash
58 lines
1.6 KiB
Bash
. ${srcdir}/emulparams/plt_unwind.sh
|
|
. ${srcdir}/emulparams/extern_protected_data.sh
|
|
. ${srcdir}/emulparams/call_nop.sh
|
|
SCRIPT_NAME=elf
|
|
ELFSIZE=64
|
|
OUTPUT_FORMAT="elf64-x86-64"
|
|
NO_REL_RELOCS=yes
|
|
TEXT_START_ADDR=0x400000
|
|
MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
|
|
COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
|
|
ARCH="i386:x86-64"
|
|
MACHINE=
|
|
TEMPLATE_NAME=elf32
|
|
GENERATE_SHLIB_SCRIPT=yes
|
|
GENERATE_PIE_SCRIPT=yes
|
|
NO_SMALL_DATA=yes
|
|
LARGE_SECTIONS=yes
|
|
LARGE_BSS_AFTER_BSS=
|
|
SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 24 ? 24 : 0"
|
|
IREL_IN_PLT=
|
|
# Reuse TINY_READONLY_SECTION which is placed right after .plt section.
|
|
TINY_READONLY_SECTION="
|
|
.plt.got ${RELOCATING-0} : { *(.plt.got) }
|
|
.plt.bnd ${RELOCATING-0} : { *(.plt.bnd) }
|
|
"
|
|
|
|
if [ "x${host}" = "x${target}" ]; then
|
|
case " $EMULATION_LIBPATH " in
|
|
*" ${EMULATION_NAME} "*)
|
|
NATIVE=yes
|
|
esac
|
|
fi
|
|
|
|
# Linux/Solaris modify the default library search path to first include
|
|
# a 64-bit specific directory.
|
|
case "$target" in
|
|
x86_64*-linux*|i[3-7]86-*-linux-*)
|
|
case "$EMULATION_NAME" in
|
|
*64*)
|
|
LIBPATH_SUFFIX=64
|
|
PARSE_AND_LIST_OPTIONS_BNDPLT='
|
|
fprintf (file, _("\
|
|
-z bndplt Always generate BND prefix in PLT entries\n"));
|
|
'
|
|
PARSE_AND_LIST_ARGS_CASE_Z_BNDPLT='
|
|
else if (strcmp (optarg, "bndplt") == 0)
|
|
link_info.bndplt = TRUE;
|
|
'
|
|
PARSE_AND_LIST_OPTIONS="$PARSE_AND_LIST_OPTIONS $PARSE_AND_LIST_OPTIONS_BNDPLT"
|
|
PARSE_AND_LIST_ARGS_CASE_Z="$PARSE_AND_LIST_ARGS_CASE_Z $PARSE_AND_LIST_ARGS_CASE_Z_BNDPLT"
|
|
;;
|
|
esac
|
|
;;
|
|
*-*-solaris2*)
|
|
LIBPATH_SUFFIX=/amd64
|
|
ELF_INTERPRETER_NAME=\"/lib/amd64/ld.so.1\"
|
|
;;
|
|
esac
|