Igor Zamyatin d258b82828 Add -z bndplt to generate BND prefix in PLT entries
This patch adds "-z bndplt" option Linux/x86-64 linker to generate BND
prefix in PLT entries.  It also updated Linux/x86-64 assembler not to
generate R_X86_64_PLT32_BND nor R_X86_64_PC32_BND relocations.

bfd/

2014-11-18  Igor Zamyatin  <igor.zamyatin@intel.com>

	* elf64-x86-64.c (elf_x86_64_check_relocs): Enable MPX PLT only
	for -z bndplt.

gas/

2014-11-18  Igor Zamyatin  <igor.zamyatin@intel.com>

	* config/tc-i386-intel.c (i386_operator): Remove last argument
	from lex_got call.
	* config/tc-i386.c (reloc): Remove bnd_prefix from parameters'
	list.  Return always BFD_RELOC_32_PCREL.
	* (output_branch): Remove condition for BFD_RELOC_X86_64_PC32_BND.
	* (output_jump): Update call to reloc accordingly.
	* (output_interseg_jump): Likewise.
	* (output_disp): Likewise.
	* (output_imm): Likewise.
	* (x86_cons_fix_new): Likewise.
	* (lex_got): Remove bnd_prefix from parameters' list in macro and
	declarations. Don't use BFD_RELOC_X86_64_PLT32_BND.
	* (x86_cons): Update call to lex_got accordingly.
	* (i386_immediate): Likewise.
	* (i386_displacement): Likewise.
	* (md_apply_fix): Don't use BFD_RELOC_X86_64_PLT32_BND nor
	BFD_RELOC_X86_64_PC32_BND.
	* (tc_gen_reloc): Likewise.

include/

2014-11-18  Igor Zamyatin  <igor.zamyatin@intel.com>

	* bfdlink.h (struct bfd_link_info): Add bndplt.

ld/

2014-11-18  Igor Zamyatin  <igor.zamyatin@intel.com>

	* emulparams/elf_x86_64.sh (BNDPLT): Set to yes for x86_64.
	* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
	"-z bndplt" if BNDPLT is yes.
	(gld${EMULATION_NAME}_list_options): Add "-z bndplt" entry.
	* ld.texinfo: Add description for bndplt.

ld/testsuite/

2014-11-18  Igor Zamyatin  <igor.zamyatin@intel.com>

	* testsuite/ld-x86-64/bnd-ifunc-1.d: Add bndplt option.
	* testsuite/ld-x86-64/bnd-ifunc-2.d: Likewise.
	* testsuite/ld-x86-64/bnd-plt-1.d: Likewise.  Update dissassembly
	sections.
	* testsuite/ld-x86-64/mpx.exp: Handle mpx3 and mpx4 tests.
	* testsuite/ld-x86-64/mpx1a.rd: Remove _BND from relocation name.
	* testsuite/ld-x86-64/mpx1c.rd: Likewise.
	* testsuite/ld-x86-64/mpx2a.rd: Likewise.
	* testsuite/ld-x86-64/mpx2c.rd: Likewise.
	* testsuite/ld-x86-64/mpx3.dd: New file.
	* testsuite/ld-x86-64/mpx3a.s: Likewise.
	* testsuite/ld-x86-64/mpx3b.s: Likewise.
	* testsuite/ld-x86-64/mpx4.dd: Likewise.
	* testsuite/ld-x86-64/mpx4a.s: Likewise.
	* testsuite/ld-x86-64/mpx4b.s: Likewise.
2014-11-18 05:40:17 -08:00

98 lines
2.9 KiB
Plaintext

# Expect script for ELF MPX tests.
# Copyright (C) 2013-2014 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
# MA 02110-1301, USA.
#
# The following tests require running the executable generated by ld,
# or enough of a build environment to create a fully linked executable.
# This is not commonly available when testing a cross-built linker.
if ![isnative] {
return
}
# Only on Linux for now.
if ![istarget "x86_64-*-linux*"] {
return
}
# Check to see if the C compiler works
if { [which $CC] == 0 } {
return
}
set build_tests {
{"Build libmpx1a.a"
"" "-Wa,-madd-bnd-prefix -fPIC"
{mpx1a.c} {{readelf {-r --wide} mpx1a.rd}} "libmpx1a.a"}
{"Build libmpx1b.a"
"" ""
{mpx1b.c} {} "libmpx1b.a"}
{"Build libmpx1c.a"
"" "-Wa,-madd-bnd-prefix"
{mpx1c.c} {{readelf {-r --wide} mpx1c.rd}} "libmpx1c.a"}
{"Build libmpx2a.a"
"" "-Wa,-madd-bnd-prefix -fPIE"
{mpx2a.c} {{readelf {-r --wide} mpx2a.rd}} "libmpx2a.a"}
{"Build libmpx2b.a"
"" "-fPIE"
{mpx2b.c} {} "libmpx2b.a"}
{"Build libmpx2c.a"
"" "-Wa,-madd-bnd-prefix -fPIE"
{mpx2c.c} {{readelf {-r --wide} mpx2c.rd}} "libmpx2c.a"}
}
run_cc_link_tests $build_tests
set run_tests {
{"Run mpx1"
"tmpdir/mpx1a.o tmpdir/mpx1b.o tmpdir/mpx1c.o" ""
{dummy.s} "mpx1" "mpx1.out"}
{"Run mpx1 with -static"
"tmpdir/mpx1a.o tmpdir/mpx1b.o tmpdir/mpx1c.o -static" ""
{dummy.s} "mpx1static" "mpx1.out"}
{"Run mpx2"
"tmpdir/mpx2a.o tmpdir/mpx2b.o tmpdir/mpx2c.o -pie" ""
{dummy.s} "mpx2" "mpx2.out"}
{"Run mpx2 with -static"
"tmpdir/mpx2a.o tmpdir/mpx2b.o tmpdir/mpx2c.o -static" ""
{dummy.s} "mpx2static" "mpx2.out"}
}
run_ld_link_tests {
{"Build libcall.so"
"-shared -z bndplt" "" ""
{mpx3b.s} {} "libcall.so"}
{"Build mpx3"
"tmpdir/libcall.so -z bndplt" "" ""
{mpx3a.s} {{objdump -dw mpx3.dd}} "mpx3"}
{"Build libcall1.so"
"-shared -z bndplt" "" ""
{mpx4b.s} {} "libcall1.so"}
{"Build mpx4"
"tmpdir/libcall1.so -z bndplt" "" ""
{mpx4a.s} {{objdump -dw mpx4.dd}} "mpx4"}
}
run_ld_link_exec_tests [] $run_tests
run_dump_test "bnd-branch-1"
run_dump_test "bnd-ifunc-1"
run_dump_test "bnd-ifunc-2"
run_dump_test "bnd-plt-1"