Add -z bndplt support (for Intel MPX).
gold/ PR gold/17643 * options.h (-z bndplt): New option. * x86_64.cc (Output_data_plt_x86_64::regular_count): New method. (Output_data_plt_x86_64::address_for_global): Move implementation into virtual method. (Output_data_plt_x86_64::address_for_local): Likewise. (Output_data_plt_x86_64::got): New method. (Output_data_plt_x86_64::got_plt): New method. (Output_data_plt_x86_64::got_irelative): New method. (Output_data_plt_x86_64::do_address_for_global): New virtual method. (Output_data_plt_x86_64::do_address_for_local): New virtual method. (class Output_data_plt_x86_64_bnd): New class. (Target_x86_64::do_make_data_plt): Move out of line and specialize for each size (both overloads). (Output_data_plt_x86_64::set_final_data_size): Cosmetic changes. * testsuite/Makefile.am (bnd_plt_1): New test case. (bnd_ifunc_1): New test case. (bnd_ifunc_2): New test case. * testsuite/Makefile.in: Regenerate. * testsuite/bnd_ifunc_1.s: New source file. * testsuite/bnd_ifunc_1.sh: New shell script. * testsuite/bnd_ifunc_2.s: New source file. * testsuite/bnd_ifunc_2.sh: New shell script. * testsuite/bnd_plt_1.s: New source file. * testsuite/bnd_plt_1.sh: New shell script.
This commit is contained in:
Cary Coutant
parent
c4d5a76223
commit
7a0c0a1475
|
|
@ -1,3 +1,31 @@
|
|||
2016-12-22 Cary Coutant <ccoutant@gmail.com>
|
||||
|
||||
PR gold/17643
|
||||
* options.h (-z bndplt): New option.
|
||||
* x86_64.cc (Output_data_plt_x86_64::regular_count): New method.
|
||||
(Output_data_plt_x86_64::address_for_global): Move implementation into
|
||||
virtual method.
|
||||
(Output_data_plt_x86_64::address_for_local): Likewise.
|
||||
(Output_data_plt_x86_64::got): New method.
|
||||
(Output_data_plt_x86_64::got_plt): New method.
|
||||
(Output_data_plt_x86_64::got_irelative): New method.
|
||||
(Output_data_plt_x86_64::do_address_for_global): New virtual method.
|
||||
(Output_data_plt_x86_64::do_address_for_local): New virtual method.
|
||||
(class Output_data_plt_x86_64_bnd): New class.
|
||||
(Target_x86_64::do_make_data_plt): Move out of line and specialize
|
||||
for each size (both overloads).
|
||||
(Output_data_plt_x86_64::set_final_data_size): Cosmetic changes.
|
||||
* testsuite/Makefile.am (bnd_plt_1): New test case.
|
||||
(bnd_ifunc_1): New test case.
|
||||
(bnd_ifunc_2): New test case.
|
||||
* testsuite/Makefile.in: Regenerate.
|
||||
* testsuite/bnd_ifunc_1.s: New source file.
|
||||
* testsuite/bnd_ifunc_1.sh: New shell script.
|
||||
* testsuite/bnd_ifunc_2.s: New source file.
|
||||
* testsuite/bnd_ifunc_2.sh: New shell script.
|
||||
* testsuite/bnd_plt_1.s: New source file.
|
||||
* testsuite/bnd_plt_1.sh: New shell script.
|
||||
|
||||
2016-12-22 Cary Coutant <ccoutant@gmail.com>
|
||||
|
||||
* layout.cc (Layout::finalize): Track count of forced-local symbols
|
||||
|
|
|
|||
|
|
@ -1403,6 +1403,9 @@ class General_options
|
|||
|
||||
// The -z options.
|
||||
|
||||
DEFINE_bool(bndplt, options::DASH_Z, '\0', false,
|
||||
N_("(x86-64 only) Generate a BND PLT for Intel MPX"),
|
||||
N_("Generate a regular PLT"));
|
||||
DEFINE_bool(combreloc, options::DASH_Z, '\0', true,
|
||||
N_("Sort dynamic relocs"),
|
||||
N_("Do not sort dynamic relocs"));
|
||||
|
|
|
|||
|
|
@ -3046,7 +3046,7 @@ if DEFAULT_TARGET_X86_64
|
|||
check_PROGRAMS += exception_x86_64_bnd_test
|
||||
exception_x86_64_bnd_test_SOURCES = exception_test_main.cc
|
||||
exception_x86_64_bnd_test_DEPENDENCIES = gcctestdir/ld exception_x86_64_bnd_1.o exception_x86_64_bnd_2.o
|
||||
exception_x86_64_bnd_test_LDFLAGS = $(exception_test_LDFLAGS)
|
||||
exception_x86_64_bnd_test_LDFLAGS = $(exception_test_LDFLAGS) -Wl,-z,bndplt
|
||||
exception_x86_64_bnd_test_LDADD = exception_x86_64_bnd_1.o exception_x86_64_bnd_2.o
|
||||
exception_x86_64_bnd_1.o: exception_test_1.cc gcctestdir/as
|
||||
$(CXXCOMPILE) -c -fpic -Bgcctestdir/ -Wa,-madd-bnd-prefix -o $@ $<
|
||||
|
|
@ -3146,6 +3146,33 @@ split_x86_64_r.stdout: split_x86_64_1.o split_x86_64_n.o ../ld-new
|
|||
MOSTLYCLEANFILES += split_x86_64_1 split_x86_64_2 split_x86_64_3 \
|
||||
split_x86_64_4 split_x86_64_r
|
||||
|
||||
check_SCRIPTS += bnd_plt_1.sh
|
||||
check_DATA += bnd_plt_1.stdout
|
||||
bnd_plt_1.o: bnd_plt_1.s
|
||||
$(TEST_AS) --64 -o $@ $<
|
||||
bnd_plt_1.so: bnd_plt_1.o ../ld-new
|
||||
../ld-new -shared -z bndplt bnd_plt_1.o -o $@
|
||||
bnd_plt_1.stdout: bnd_plt_1.so
|
||||
$(TEST_OBJDUMP) -dw $< > $@
|
||||
|
||||
check_SCRIPTS += bnd_ifunc_1.sh
|
||||
check_DATA += bnd_ifunc_1.stdout
|
||||
bnd_ifunc_1.o: bnd_ifunc_1.s
|
||||
$(TEST_AS) --64 -madd-bnd-prefix -o $@ $<
|
||||
bnd_ifunc_1.so: bnd_ifunc_1.o ../ld-new
|
||||
../ld-new -shared -z bndplt bnd_ifunc_1.o -o $@
|
||||
bnd_ifunc_1.stdout: bnd_ifunc_1.so
|
||||
$(TEST_OBJDUMP) -dw $< > $@
|
||||
|
||||
check_SCRIPTS += bnd_ifunc_2.sh
|
||||
check_DATA += bnd_ifunc_2.stdout
|
||||
bnd_ifunc_2.o: bnd_ifunc_2.s
|
||||
$(TEST_AS) --64 -madd-bnd-prefix -o $@ $<
|
||||
bnd_ifunc_2.so: bnd_ifunc_2.o ../ld-new
|
||||
../ld-new -shared -z bndplt bnd_ifunc_2.o -o $@
|
||||
bnd_ifunc_2.stdout: bnd_ifunc_2.so
|
||||
$(TEST_OBJDUMP) -dw $< > $@
|
||||
|
||||
endif DEFAULT_TARGET_X86_64
|
||||
|
||||
if DEFAULT_TARGET_X32
|
||||
|
|
|
|||
|
|
@ -813,10 +813,18 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
|
|||
@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_89 = split_i386_1 split_i386_2 split_i386_3 \
|
||||
@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_i386_4 split_i386_r
|
||||
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_90 = split_x86_64.sh
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_91 = split_x86_64_1.stdout split_x86_64_2.stdout \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_3.stdout split_x86_64_4.stdout split_x86_64_r.stdout
|
||||
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_90 = split_x86_64.sh \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_plt_1.sh \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_1.sh \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_2.sh
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_91 = split_x86_64_1.stdout \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_2.stdout \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_3.stdout \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_4.stdout \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_r.stdout \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_plt_1.stdout \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_1.stdout \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_2.stdout
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_92 = split_x86_64_1 split_x86_64_2 split_x86_64_3 \
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_4 split_x86_64_r
|
||||
|
||||
|
|
@ -3352,7 +3360,7 @@ LDADD = libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL) \
|
|||
@GCC_TRUE@@NATIVE_LINKER_TRUE@ehdr_start_test_5_LDADD =
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_SOURCES = exception_test_main.cc
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_DEPENDENCIES = gcctestdir/ld exception_x86_64_bnd_1.o exception_x86_64_bnd_2.o
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_LDFLAGS = $(exception_test_LDFLAGS)
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_LDFLAGS = $(exception_test_LDFLAGS) -Wl,-z,bndplt
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_LDADD = exception_x86_64_bnd_1.o exception_x86_64_bnd_2.o
|
||||
@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@SPLIT_DEFSYMS = --defsym __morestack=0x100 --defsym __morestack_non_split=0x200
|
||||
@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@SPLIT_DEFSYMS = --defsym __morestack=0x100 --defsym __morestack_non_split=0x200
|
||||
|
|
@ -5224,6 +5232,12 @@ split_i386.sh.log: split_i386.sh
|
|||
@p='split_i386.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
|
||||
split_x86_64.sh.log: split_x86_64.sh
|
||||
@p='split_x86_64.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
|
||||
bnd_plt_1.sh.log: bnd_plt_1.sh
|
||||
@p='bnd_plt_1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
|
||||
bnd_ifunc_1.sh.log: bnd_ifunc_1.sh
|
||||
@p='bnd_ifunc_1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
|
||||
bnd_ifunc_2.sh.log: bnd_ifunc_2.sh
|
||||
@p='bnd_ifunc_2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
|
||||
split_x32.sh.log: split_x32.sh
|
||||
@p='split_x32.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
|
||||
arm_abs_global.sh.log: arm_abs_global.sh
|
||||
|
|
@ -7318,6 +7332,24 @@ uninstall-am:
|
|||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_OBJDUMP) -d $< > $@
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x86_64_r.stdout: split_x86_64_1.o split_x86_64_n.o ../ld-new
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new -r split_x86_64_1.o split_x86_64_n.o -o split_x86_64_r > $@ 2>&1 || exit 0
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@bnd_plt_1.o: bnd_plt_1.s
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) --64 -o $@ $<
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@bnd_plt_1.so: bnd_plt_1.o ../ld-new
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new -shared -z bndplt bnd_plt_1.o -o $@
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@bnd_plt_1.stdout: bnd_plt_1.so
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_OBJDUMP) -dw $< > $@
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@bnd_ifunc_1.o: bnd_ifunc_1.s
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) --64 -madd-bnd-prefix -o $@ $<
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@bnd_ifunc_1.so: bnd_ifunc_1.o ../ld-new
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new -shared -z bndplt bnd_ifunc_1.o -o $@
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@bnd_ifunc_1.stdout: bnd_ifunc_1.so
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_OBJDUMP) -dw $< > $@
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@bnd_ifunc_2.o: bnd_ifunc_2.s
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) --64 -madd-bnd-prefix -o $@ $<
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@bnd_ifunc_2.so: bnd_ifunc_2.o ../ld-new
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new -shared -z bndplt bnd_ifunc_2.o -o $@
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@bnd_ifunc_2.stdout: bnd_ifunc_2.so
|
||||
@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_OBJDUMP) -dw $< > $@
|
||||
@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_1.o: split_x32_1.s
|
||||
@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) -o $@ $<
|
||||
@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_2.o: split_x32_2.s
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
.type foo, %gnu_indirect_function
|
||||
.global __GI_foo
|
||||
.hidden __GI_foo
|
||||
.set __GI_foo, foo
|
||||
.text
|
||||
.globl foo
|
||||
.type foo, @function
|
||||
foo:
|
||||
ret
|
||||
.size foo, .-foo
|
||||
.globl bar
|
||||
.type bar, @function
|
||||
bar:
|
||||
call __GI_foo@PLT
|
||||
ret
|
||||
.size bar, .-bar
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
#!/bin/sh
|
||||
|
||||
# bnd_ifunc_1.sh -- test -z bndplt for x86_64
|
||||
|
||||
# Copyright (C) 2016 Free Software Foundation, Inc.
|
||||
# Written by Cary Coutant <ccoutant@gmail.com>.
|
||||
|
||||
# This file is part of gold.
|
||||
|
||||
# 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.
|
||||
|
||||
match()
|
||||
{
|
||||
if ! egrep "$1" "$2" >/dev/null 2>&1; then
|
||||
echo 1>&2 "could not find '$1' in $2"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
match '[0-9a-f]*:.*bnd jmpq \*0x[0-9a-f]*\(%rip\) *# [0-9a-f]* <_GLOBAL_OFFSET_TABLE_\+0x18>' bnd_ifunc_1.stdout
|
||||
APLT_ADDR=$(egrep '[0-9a-f]*:.*bnd jmpq \*0x[0-9a-f]*\(%rip\) *# [0-9a-f]* <_GLOBAL_OFFSET_TABLE_\+0x18>' bnd_ifunc_1.stdout |
|
||||
sed -e 's/ *\([0-9a-f]*\):.*/\1/')
|
||||
match "bnd callq $APLT_ADDR" bnd_ifunc_1.stdout
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
.text
|
||||
.globl fct1
|
||||
.type fct1, @gnu_indirect_function
|
||||
.set fct1,resolve1
|
||||
.hidden int_fct1
|
||||
.globl int_fct1
|
||||
.set int_fct1,fct1
|
||||
.type resolve1, @function
|
||||
resolve1:
|
||||
call func1@PLT
|
||||
.globl g1
|
||||
.type g1, @function
|
||||
g1:
|
||||
jmp int_fct1@PLT
|
||||
|
||||
.globl fct2
|
||||
.type fct2, @gnu_indirect_function
|
||||
.set fct2,resolve2
|
||||
.hidden int_fct2
|
||||
.globl int_fct2
|
||||
.set int_fct2,fct2
|
||||
.type resolve2, @function
|
||||
resolve2:
|
||||
call func2@PLT
|
||||
.globl g2
|
||||
.type g2, @function
|
||||
g2:
|
||||
jmp int_fct2@PLT
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
#!/bin/sh
|
||||
|
||||
# bnd_ifunc_2.sh -- test -z bndplt for x86_64
|
||||
|
||||
# Copyright (C) 2016 Free Software Foundation, Inc.
|
||||
# Written by Cary Coutant <ccoutant@gmail.com>.
|
||||
|
||||
# This file is part of gold.
|
||||
|
||||
# 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.
|
||||
|
||||
match()
|
||||
{
|
||||
if ! egrep "$1" "$2" >/dev/null 2>&1; then
|
||||
echo 1>&2 "could not find '$1' in $2"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Extract just the PLT portion of the disassembly.
|
||||
get_plt()
|
||||
{
|
||||
sed -n -e '/^Disassembly of section .plt:/,/^Disassembly/p'
|
||||
}
|
||||
|
||||
# Extract the addresses of the indirect jumps, omitting the PLT0 entry.
|
||||
get_aplt_jmpq_addresses()
|
||||
{
|
||||
sed -n -e '/_GLOBAL_OFFSET_TABLE_+0x10/d' \
|
||||
-e '/bnd jmpq \*0x[0-9a-f]*(%rip)/p' |
|
||||
sed -e 's/ *\([0-9a-f]*\):.*/\1/'
|
||||
}
|
||||
|
||||
for APLT_ADDR in $(get_plt < bnd_ifunc_2.stdout | get_aplt_jmpq_addresses)
|
||||
do
|
||||
match "bnd (callq|jmpq) $APLT_ADDR" bnd_ifunc_2.stdout
|
||||
done
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
.text
|
||||
.globl _start
|
||||
_start:
|
||||
bnd jmp foo1@plt
|
||||
call foo2@plt
|
||||
jmp foo3@plt
|
||||
call foo4@plt
|
||||
bnd call foo3@plt
|
||||
jmp foo4@plt
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
#!/bin/sh
|
||||
|
||||
# bnd_plt_1.sh -- test -z bndplt for x86_64
|
||||
|
||||
# Copyright (C) 2016 Free Software Foundation, Inc.
|
||||
# Written by Cary Coutant <ccoutant@gmail.com>.
|
||||
|
||||
# This file is part of gold.
|
||||
|
||||
# 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.
|
||||
|
||||
match()
|
||||
{
|
||||
if ! egrep "$1" "$2" >/dev/null 2>&1; then
|
||||
echo 1>&2 "could not find '$1' in $2"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Extract just the PLT portion of the disassembly.
|
||||
get_plt()
|
||||
{
|
||||
sed -n -e '/^Disassembly of section .plt:/,/^Disassembly/p'
|
||||
}
|
||||
|
||||
# Extract the addresses of the indirect jumps, omitting the PLT0 entry.
|
||||
get_aplt_jmpq_addresses()
|
||||
{
|
||||
sed -n -e '/_GLOBAL_OFFSET_TABLE_+0x10/d' \
|
||||
-e '/bnd jmpq \*0x[0-9a-f]*(%rip)/p' |
|
||||
sed -e 's/ *\([0-9a-f]*\):.*/\1/'
|
||||
}
|
||||
|
||||
match 'bnd jmpq \*0x[0-9a-f]*\(%rip\) *# [0-9a-f]* <_GLOBAL_OFFSET_TABLE_\+0x10>' bnd_plt_1.stdout
|
||||
|
||||
for APLT_ADDR in $(get_plt < bnd_ifunc_2.stdout | get_aplt_jmpq_addresses)
|
||||
do
|
||||
match "bnd (callq|jmpq) $APLT_ADDR" bnd_ifunc_2.stdout
|
||||
done
|
||||
520
gold/x86_64.cc
520
gold/x86_64.cc
|
|
@ -179,7 +179,12 @@ class Output_data_plt_x86_64 : public Output_section_data
|
|||
has_irelative_section() const
|
||||
{ return this->irelative_rel_ != NULL; }
|
||||
|
||||
// Return the number of PLT entries.
|
||||
// Get count of regular PLT entries.
|
||||
unsigned int
|
||||
regular_count() const
|
||||
{ return this->count_; }
|
||||
|
||||
// Return the total number of PLT entries.
|
||||
unsigned int
|
||||
entry_count() const
|
||||
{ return this->count_ + this->irelative_count_; }
|
||||
|
|
@ -204,11 +209,13 @@ class Output_data_plt_x86_64 : public Output_section_data
|
|||
|
||||
// Return the PLT address to use for a global symbol.
|
||||
uint64_t
|
||||
address_for_global(const Symbol*);
|
||||
address_for_global(const Symbol* sym)
|
||||
{ return do_address_for_global(sym); }
|
||||
|
||||
// Return the PLT address to use for a local symbol.
|
||||
uint64_t
|
||||
address_for_local(const Relobj*, unsigned int symndx);
|
||||
address_for_local(const Relobj* obj, unsigned int symndx)
|
||||
{ return do_address_for_local(obj, symndx); }
|
||||
|
||||
// Add .eh_frame information for the PLT.
|
||||
void
|
||||
|
|
@ -216,6 +223,18 @@ class Output_data_plt_x86_64 : public Output_section_data
|
|||
{ this->do_add_eh_frame(layout); }
|
||||
|
||||
protected:
|
||||
Output_data_got<64, false>*
|
||||
got() const
|
||||
{ return this->got_; }
|
||||
|
||||
Output_data_got_plt_x86_64*
|
||||
got_plt() const
|
||||
{ return this->got_plt_; }
|
||||
|
||||
Output_data_space*
|
||||
got_irelative() const
|
||||
{ return this->got_irelative_; }
|
||||
|
||||
// Fill in the first PLT entry.
|
||||
void
|
||||
fill_first_plt_entry(unsigned char* pov,
|
||||
|
|
@ -275,6 +294,14 @@ class Output_data_plt_x86_64 : public Output_section_data
|
|||
unsigned int tlsdesc_got_offset,
|
||||
unsigned int plt_offset) = 0;
|
||||
|
||||
// Return the PLT address to use for a global symbol.
|
||||
virtual uint64_t
|
||||
do_address_for_global(const Symbol* sym);
|
||||
|
||||
// Return the PLT address to use for a local symbol.
|
||||
virtual uint64_t
|
||||
do_address_for_local(const Relobj* obj, unsigned int symndx);
|
||||
|
||||
virtual void
|
||||
do_add_eh_frame(Layout* layout) = 0;
|
||||
|
||||
|
|
@ -403,6 +430,118 @@ class Output_data_plt_x86_64_standard : public Output_data_plt_x86_64<size>
|
|||
static const unsigned char plt_eh_frame_fde[plt_eh_frame_fde_size];
|
||||
};
|
||||
|
||||
class Output_data_plt_x86_64_bnd : public Output_data_plt_x86_64<64>
|
||||
{
|
||||
public:
|
||||
Output_data_plt_x86_64_bnd(Layout* layout,
|
||||
Output_data_got<64, false>* got,
|
||||
Output_data_got_plt_x86_64* got_plt,
|
||||
Output_data_space* got_irelative)
|
||||
: Output_data_plt_x86_64<64>(layout, plt_entry_size,
|
||||
got, got_plt, got_irelative),
|
||||
aplt_offset_(0)
|
||||
{ }
|
||||
|
||||
Output_data_plt_x86_64_bnd(Layout* layout,
|
||||
Output_data_got<64, false>* got,
|
||||
Output_data_got_plt_x86_64* got_plt,
|
||||
Output_data_space* got_irelative,
|
||||
unsigned int plt_count)
|
||||
: Output_data_plt_x86_64<64>(layout, plt_entry_size,
|
||||
got, got_plt, got_irelative,
|
||||
plt_count),
|
||||
aplt_offset_(0)
|
||||
{ }
|
||||
|
||||
protected:
|
||||
virtual unsigned int
|
||||
do_get_plt_entry_size() const
|
||||
{ return plt_entry_size; }
|
||||
|
||||
// Return the PLT address to use for a global symbol.
|
||||
uint64_t
|
||||
do_address_for_global(const Symbol*);
|
||||
|
||||
// Return the PLT address to use for a local symbol.
|
||||
uint64_t
|
||||
do_address_for_local(const Relobj*, unsigned int symndx);
|
||||
|
||||
virtual void
|
||||
do_add_eh_frame(Layout* layout)
|
||||
{
|
||||
layout->add_eh_frame_for_plt(this,
|
||||
this->plt_eh_frame_cie,
|
||||
this->plt_eh_frame_cie_size,
|
||||
plt_eh_frame_fde,
|
||||
plt_eh_frame_fde_size);
|
||||
}
|
||||
|
||||
virtual void
|
||||
do_fill_first_plt_entry(unsigned char* pov,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_addr,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr plt_addr);
|
||||
|
||||
virtual unsigned int
|
||||
do_fill_plt_entry(unsigned char* pov,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_address,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr plt_address,
|
||||
unsigned int got_offset,
|
||||
unsigned int plt_offset,
|
||||
unsigned int plt_index);
|
||||
|
||||
virtual void
|
||||
do_fill_tlsdesc_entry(unsigned char* pov,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_address,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr plt_address,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_base,
|
||||
unsigned int tlsdesc_got_offset,
|
||||
unsigned int plt_offset);
|
||||
|
||||
void
|
||||
fill_aplt_entry(unsigned char* pov,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_address,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr plt_address,
|
||||
unsigned int got_offset,
|
||||
unsigned int plt_offset,
|
||||
unsigned int plt_index);
|
||||
|
||||
private:
|
||||
// Set the final size.
|
||||
void
|
||||
set_final_data_size();
|
||||
|
||||
// Write out the BND PLT data.
|
||||
void
|
||||
do_write(Output_file*);
|
||||
|
||||
// Offset of the Additional PLT (if using -z bndplt).
|
||||
unsigned int aplt_offset_;
|
||||
|
||||
// The size of an entry in the PLT.
|
||||
static const int plt_entry_size = 16;
|
||||
|
||||
// The size of an entry in the additional PLT.
|
||||
static const int aplt_entry_size = 8;
|
||||
|
||||
// The first entry in the PLT.
|
||||
// From the AMD64 ABI: "Unlike Intel386 ABI, this ABI uses the same
|
||||
// procedure linkage table for both programs and shared objects."
|
||||
static const unsigned char first_plt_entry[plt_entry_size];
|
||||
|
||||
// Other entries in the PLT for an executable.
|
||||
static const unsigned char plt_entry[plt_entry_size];
|
||||
|
||||
// Entries in the additional PLT.
|
||||
static const unsigned char aplt_entry[aplt_entry_size];
|
||||
|
||||
// The reserved TLSDESC entry in the PLT for an executable.
|
||||
static const unsigned char tlsdesc_plt_entry[plt_entry_size];
|
||||
|
||||
// The .eh_frame unwind information for the PLT.
|
||||
static const int plt_eh_frame_fde_size = 32;
|
||||
static const unsigned char plt_eh_frame_fde[plt_eh_frame_fde_size];
|
||||
};
|
||||
|
||||
template<int size>
|
||||
class Lazy_view
|
||||
{
|
||||
|
|
@ -714,23 +853,14 @@ class Target_x86_64 : public Sized_target<size, false>
|
|||
do_make_data_plt(Layout* layout,
|
||||
Output_data_got<64, false>* got,
|
||||
Output_data_got_plt_x86_64* got_plt,
|
||||
Output_data_space* got_irelative)
|
||||
{
|
||||
return new Output_data_plt_x86_64_standard<size>(layout, got, got_plt,
|
||||
got_irelative);
|
||||
}
|
||||
Output_data_space* got_irelative);
|
||||
|
||||
virtual Output_data_plt_x86_64<size>*
|
||||
do_make_data_plt(Layout* layout,
|
||||
Output_data_got<64, false>* got,
|
||||
Output_data_got_plt_x86_64* got_plt,
|
||||
Output_data_space* got_irelative,
|
||||
unsigned int plt_count)
|
||||
{
|
||||
return new Output_data_plt_x86_64_standard<size>(layout, got, got_plt,
|
||||
got_irelative,
|
||||
plt_count);
|
||||
}
|
||||
unsigned int plt_count);
|
||||
|
||||
private:
|
||||
// The class which scans relocations.
|
||||
|
|
@ -1528,7 +1658,7 @@ Output_data_plt_x86_64<size>::rela_irelative(Symbol_table* symtab,
|
|||
|
||||
template<int size>
|
||||
uint64_t
|
||||
Output_data_plt_x86_64<size>::address_for_global(const Symbol* gsym)
|
||||
Output_data_plt_x86_64<size>::do_address_for_global(const Symbol* gsym)
|
||||
{
|
||||
uint64_t offset = 0;
|
||||
if (gsym->type() == elfcpp::STT_GNU_IFUNC
|
||||
|
|
@ -1542,8 +1672,8 @@ Output_data_plt_x86_64<size>::address_for_global(const Symbol* gsym)
|
|||
|
||||
template<int size>
|
||||
uint64_t
|
||||
Output_data_plt_x86_64<size>::address_for_local(const Relobj* object,
|
||||
unsigned int r_sym)
|
||||
Output_data_plt_x86_64<size>::do_address_for_local(const Relobj* object,
|
||||
unsigned int r_sym)
|
||||
{
|
||||
return (this->address()
|
||||
+ (this->count_ + 1) * this->get_plt_entry_size()
|
||||
|
|
@ -1555,10 +1685,12 @@ template<int size>
|
|||
void
|
||||
Output_data_plt_x86_64<size>::set_final_data_size()
|
||||
{
|
||||
unsigned int count = this->count_ + this->irelative_count_;
|
||||
// Number of regular and IFUNC PLT entries, plus the first entry.
|
||||
unsigned int count = this->count_ + this->irelative_count_ + 1;
|
||||
// Count the TLSDESC entry, if present.
|
||||
if (this->has_tlsdesc_entry())
|
||||
++count;
|
||||
this->set_data_size((count + 1) * this->get_plt_entry_size());
|
||||
this->set_data_size(count * this->get_plt_entry_size());
|
||||
}
|
||||
|
||||
// The first entry in the PLT for an executable.
|
||||
|
|
@ -1673,6 +1805,178 @@ Output_data_plt_x86_64_standard<size>::do_fill_tlsdesc_entry(
|
|||
+ 12)));
|
||||
}
|
||||
|
||||
// Return the APLT address to use for a global symbol (for -z bndplt).
|
||||
|
||||
uint64_t
|
||||
Output_data_plt_x86_64_bnd::do_address_for_global(const Symbol* gsym)
|
||||
{
|
||||
uint64_t offset = this->aplt_offset_;
|
||||
// Convert the PLT offset into an APLT offset.
|
||||
unsigned int plt_offset = gsym->plt_offset();
|
||||
if (gsym->type() == elfcpp::STT_GNU_IFUNC
|
||||
&& gsym->can_use_relative_reloc(false))
|
||||
offset += this->regular_count() * aplt_entry_size;
|
||||
else
|
||||
plt_offset -= plt_entry_size;
|
||||
plt_offset = plt_offset / (plt_entry_size / aplt_entry_size);
|
||||
return this->address() + offset + plt_offset;
|
||||
}
|
||||
|
||||
// Return the PLT address to use for a local symbol. These are always
|
||||
// IRELATIVE relocs.
|
||||
|
||||
uint64_t
|
||||
Output_data_plt_x86_64_bnd::do_address_for_local(const Relobj* object,
|
||||
unsigned int r_sym)
|
||||
{
|
||||
// Convert the PLT offset into an APLT offset.
|
||||
unsigned int plt_offset = ((object->local_plt_offset(r_sym) - plt_entry_size)
|
||||
/ (plt_entry_size / aplt_entry_size));
|
||||
return (this->address()
|
||||
+ this->aplt_offset_
|
||||
+ this->regular_count() * aplt_entry_size
|
||||
+ plt_offset);
|
||||
}
|
||||
|
||||
// Set the final size.
|
||||
void
|
||||
Output_data_plt_x86_64_bnd::set_final_data_size()
|
||||
{
|
||||
// Number of regular and IFUNC PLT entries.
|
||||
unsigned int count = this->entry_count();
|
||||
// Count the first entry and the TLSDESC entry, if present.
|
||||
unsigned int extra = this->has_tlsdesc_entry() ? 2 : 1;
|
||||
unsigned int plt_size = (count + extra) * plt_entry_size;
|
||||
// Offset of the APLT.
|
||||
this->aplt_offset_ = plt_size;
|
||||
// Size of the APLT.
|
||||
plt_size += count * aplt_entry_size;
|
||||
this->set_data_size(plt_size);
|
||||
}
|
||||
|
||||
// The first entry in the BND PLT.
|
||||
|
||||
const unsigned char
|
||||
Output_data_plt_x86_64_bnd::first_plt_entry[plt_entry_size] =
|
||||
{
|
||||
// From AMD64 ABI Draft 0.98, page 76
|
||||
0xff, 0x35, // pushq contents of memory address
|
||||
0, 0, 0, 0, // replaced with address of .got + 8
|
||||
0xf2, 0xff, 0x25, // bnd jmp indirect
|
||||
0, 0, 0, 0, // replaced with address of .got + 16
|
||||
0x0f, 0x1f, 0x00 // nop
|
||||
};
|
||||
|
||||
void
|
||||
Output_data_plt_x86_64_bnd::do_fill_first_plt_entry(
|
||||
unsigned char* pov,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_address,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr plt_address)
|
||||
{
|
||||
memcpy(pov, first_plt_entry, plt_entry_size);
|
||||
// We do a jmp relative to the PC at the end of this instruction.
|
||||
elfcpp::Swap_unaligned<32, false>::writeval(pov + 2,
|
||||
(got_address + 8
|
||||
- (plt_address + 6)));
|
||||
elfcpp::Swap<32, false>::writeval(pov + 9,
|
||||
(got_address + 16
|
||||
- (plt_address + 13)));
|
||||
}
|
||||
|
||||
// Subsequent entries in the BND PLT.
|
||||
|
||||
const unsigned char
|
||||
Output_data_plt_x86_64_bnd::plt_entry[plt_entry_size] =
|
||||
{
|
||||
// From AMD64 ABI Draft 0.99.8, page 139
|
||||
0x68, // pushq immediate
|
||||
0, 0, 0, 0, // replaced with offset into relocation table
|
||||
0xf2, 0xe9, // bnd jmpq relative
|
||||
0, 0, 0, 0, // replaced with offset to start of .plt
|
||||
0x0f, 0x1f, 0x44, 0, 0 // nop
|
||||
};
|
||||
|
||||
// Entries in the BND Additional PLT.
|
||||
|
||||
const unsigned char
|
||||
Output_data_plt_x86_64_bnd::aplt_entry[aplt_entry_size] =
|
||||
{
|
||||
// From AMD64 ABI Draft 0.99.8, page 139
|
||||
0xf2, 0xff, 0x25, // bnd jmpq indirect
|
||||
0, 0, 0, 0, // replaced with address of symbol in .got
|
||||
0x90, // nop
|
||||
};
|
||||
|
||||
unsigned int
|
||||
Output_data_plt_x86_64_bnd::do_fill_plt_entry(
|
||||
unsigned char* pov,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr,
|
||||
unsigned int,
|
||||
unsigned int plt_offset,
|
||||
unsigned int plt_index)
|
||||
{
|
||||
memcpy(pov, plt_entry, plt_entry_size);
|
||||
elfcpp::Swap_unaligned<32, false>::writeval(pov + 1, plt_index);
|
||||
elfcpp::Swap<32, false>::writeval(pov + 7, -(plt_offset + 11));
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
Output_data_plt_x86_64_bnd::fill_aplt_entry(
|
||||
unsigned char* pov,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_address,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr plt_address,
|
||||
unsigned int got_offset,
|
||||
unsigned int plt_offset,
|
||||
unsigned int plt_index)
|
||||
{
|
||||
// Check PC-relative offset overflow in PLT entry.
|
||||
uint64_t plt_got_pcrel_offset = (got_address + got_offset
|
||||
- (plt_address + plt_offset + 7));
|
||||
if (Bits<32>::has_overflow(plt_got_pcrel_offset))
|
||||
gold_error(_("PC-relative offset overflow in APLT entry %d"),
|
||||
plt_index + 1);
|
||||
|
||||
memcpy(pov, aplt_entry, aplt_entry_size);
|
||||
elfcpp::Swap_unaligned<32, false>::writeval(pov + 3, plt_got_pcrel_offset);
|
||||
}
|
||||
|
||||
// The reserved TLSDESC entry in the PLT for an executable.
|
||||
|
||||
const unsigned char
|
||||
Output_data_plt_x86_64_bnd::tlsdesc_plt_entry[plt_entry_size] =
|
||||
{
|
||||
// From Alexandre Oliva, "Thread-Local Storage Descriptors for IA32
|
||||
// and AMD64/EM64T", Version 0.9.4 (2005-10-10).
|
||||
0xff, 0x35, // pushq x(%rip)
|
||||
0, 0, 0, 0, // replaced with address of linkmap GOT entry (at PLTGOT + 8)
|
||||
0xf2, 0xff, 0x25, // jmpq *y(%rip)
|
||||
0, 0, 0, 0, // replaced with offset of reserved TLSDESC_GOT entry
|
||||
0x0f, 0x1f, 0 // nop
|
||||
};
|
||||
|
||||
void
|
||||
Output_data_plt_x86_64_bnd::do_fill_tlsdesc_entry(
|
||||
unsigned char* pov,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_address,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr plt_address,
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_base,
|
||||
unsigned int tlsdesc_got_offset,
|
||||
unsigned int plt_offset)
|
||||
{
|
||||
memcpy(pov, tlsdesc_plt_entry, plt_entry_size);
|
||||
elfcpp::Swap_unaligned<32, false>::writeval(pov + 2,
|
||||
(got_address + 8
|
||||
- (plt_address + plt_offset
|
||||
+ 6)));
|
||||
elfcpp::Swap_unaligned<32, false>::writeval(pov + 9,
|
||||
(got_base
|
||||
+ tlsdesc_got_offset
|
||||
- (plt_address + plt_offset
|
||||
+ 13)));
|
||||
}
|
||||
|
||||
// The .eh_frame unwind information for the PLT.
|
||||
|
||||
template<int size>
|
||||
|
|
@ -1723,6 +2027,34 @@ Output_data_plt_x86_64_standard<size>::plt_eh_frame_fde[plt_eh_frame_fde_size] =
|
|||
elfcpp::DW_CFA_nop
|
||||
};
|
||||
|
||||
// The .eh_frame unwind information for the BND PLT.
|
||||
const unsigned char
|
||||
Output_data_plt_x86_64_bnd::plt_eh_frame_fde[plt_eh_frame_fde_size] =
|
||||
{
|
||||
0, 0, 0, 0, // Replaced with offset to .plt.
|
||||
0, 0, 0, 0, // Replaced with size of .plt.
|
||||
0, // Augmentation size.
|
||||
elfcpp::DW_CFA_def_cfa_offset, 16, // DW_CFA_def_cfa_offset: 16.
|
||||
elfcpp::DW_CFA_advance_loc + 6, // Advance 6 to __PLT__ + 6.
|
||||
elfcpp::DW_CFA_def_cfa_offset, 24, // DW_CFA_def_cfa_offset: 24.
|
||||
elfcpp::DW_CFA_advance_loc + 10, // Advance 10 to __PLT__ + 16.
|
||||
elfcpp::DW_CFA_def_cfa_expression, // DW_CFA_def_cfa_expression.
|
||||
11, // Block length.
|
||||
elfcpp::DW_OP_breg7, 8, // Push %rsp + 8.
|
||||
elfcpp::DW_OP_breg16, 0, // Push %rip.
|
||||
elfcpp::DW_OP_lit15, // Push 0xf.
|
||||
elfcpp::DW_OP_and, // & (%rip & 0xf).
|
||||
elfcpp::DW_OP_lit5, // Push 5.
|
||||
elfcpp::DW_OP_ge, // >= ((%rip & 0xf) >= 5)
|
||||
elfcpp::DW_OP_lit3, // Push 3.
|
||||
elfcpp::DW_OP_shl, // << (((%rip & 0xf) >= 5) << 3)
|
||||
elfcpp::DW_OP_plus, // + ((((%rip&0xf)>=5)<<3)+%rsp+8
|
||||
elfcpp::DW_CFA_nop, // Align to 32 bytes.
|
||||
elfcpp::DW_CFA_nop,
|
||||
elfcpp::DW_CFA_nop,
|
||||
elfcpp::DW_CFA_nop
|
||||
};
|
||||
|
||||
// Write out the PLT. This uses the hand-coded instructions above,
|
||||
// and adjusts them as needed. This is specified by the AMD64 ABI.
|
||||
|
||||
|
|
@ -1802,6 +2134,100 @@ Output_data_plt_x86_64<size>::do_write(Output_file* of)
|
|||
of->write_output_view(got_file_offset, got_size, got_view);
|
||||
}
|
||||
|
||||
// Write out the BND PLT.
|
||||
|
||||
void
|
||||
Output_data_plt_x86_64_bnd::do_write(Output_file* of)
|
||||
{
|
||||
const off_t offset = this->offset();
|
||||
const section_size_type oview_size =
|
||||
convert_to_section_size_type(this->data_size());
|
||||
unsigned char* const oview = of->get_output_view(offset, oview_size);
|
||||
|
||||
Output_data_got<64, false>* got = this->got();
|
||||
Output_data_got_plt_x86_64* got_plt = this->got_plt();
|
||||
Output_data_space* got_irelative = this->got_irelative();
|
||||
|
||||
const off_t got_file_offset = got_plt->offset();
|
||||
gold_assert(parameters->incremental_update()
|
||||
|| (got_file_offset + got_plt->data_size()
|
||||
== got_irelative->offset()));
|
||||
const section_size_type got_size =
|
||||
convert_to_section_size_type(got_plt->data_size()
|
||||
+ got_irelative->data_size());
|
||||
unsigned char* const got_view = of->get_output_view(got_file_offset,
|
||||
got_size);
|
||||
|
||||
unsigned char* pov = oview;
|
||||
|
||||
// The base address of the .plt section.
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr plt_address = this->address();
|
||||
// The base address of the .got section.
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_base = got->address();
|
||||
// The base address of the PLT portion of the .got section,
|
||||
// which is where the GOT pointer will point, and where the
|
||||
// three reserved GOT entries are located.
|
||||
typename elfcpp::Elf_types<64>::Elf_Addr got_address = got_plt->address();
|
||||
|
||||
this->fill_first_plt_entry(pov, got_address, plt_address);
|
||||
pov += plt_entry_size;
|
||||
|
||||
// The first three entries in the GOT are reserved, and are written
|
||||
// by Output_data_got_plt_x86_64::do_write.
|
||||
unsigned char* got_pov = got_view + 24;
|
||||
|
||||
unsigned int plt_offset = plt_entry_size;
|
||||
unsigned int got_offset = 24;
|
||||
const unsigned int count = this->entry_count();
|
||||
for (unsigned int plt_index = 0;
|
||||
plt_index < count;
|
||||
++plt_index,
|
||||
pov += plt_entry_size,
|
||||
got_pov += 8,
|
||||
plt_offset += plt_entry_size,
|
||||
got_offset += 8)
|
||||
{
|
||||
// Set and adjust the PLT entry itself.
|
||||
unsigned int lazy_offset = this->fill_plt_entry(pov,
|
||||
got_address, plt_address,
|
||||
got_offset, plt_offset,
|
||||
plt_index);
|
||||
|
||||
// Set the entry in the GOT.
|
||||
elfcpp::Swap<64, false>::writeval(got_pov,
|
||||
plt_address + plt_offset + lazy_offset);
|
||||
}
|
||||
|
||||
if (this->has_tlsdesc_entry())
|
||||
{
|
||||
// Set and adjust the reserved TLSDESC PLT entry.
|
||||
unsigned int tlsdesc_got_offset = this->get_tlsdesc_got_offset();
|
||||
this->fill_tlsdesc_entry(pov, got_address, plt_address, got_base,
|
||||
tlsdesc_got_offset, plt_offset);
|
||||
pov += this->get_plt_entry_size();
|
||||
}
|
||||
|
||||
// Write the additional PLT.
|
||||
got_offset = 24;
|
||||
for (unsigned int plt_index = 0;
|
||||
plt_index < count;
|
||||
++plt_index,
|
||||
pov += aplt_entry_size,
|
||||
plt_offset += aplt_entry_size,
|
||||
got_offset += 8)
|
||||
{
|
||||
// Set and adjust the PLT entry itself.
|
||||
this->fill_aplt_entry(pov, got_address, plt_address, got_offset,
|
||||
plt_offset, plt_index);
|
||||
}
|
||||
|
||||
gold_assert(static_cast<section_size_type>(pov - oview) == oview_size);
|
||||
gold_assert(static_cast<section_size_type>(got_pov - got_view) == got_size);
|
||||
|
||||
of->write_output_view(offset, oview_size, oview);
|
||||
of->write_output_view(got_file_offset, got_size, got_view);
|
||||
}
|
||||
|
||||
// Create the PLT section.
|
||||
|
||||
template<int size>
|
||||
|
|
@ -1831,6 +2257,62 @@ Target_x86_64<size>::make_plt_section(Symbol_table* symtab, Layout* layout)
|
|||
}
|
||||
}
|
||||
|
||||
template<>
|
||||
Output_data_plt_x86_64<32>*
|
||||
Target_x86_64<32>::do_make_data_plt(Layout* layout,
|
||||
Output_data_got<64, false>* got,
|
||||
Output_data_got_plt_x86_64* got_plt,
|
||||
Output_data_space* got_irelative)
|
||||
{
|
||||
return new Output_data_plt_x86_64_standard<32>(layout, got, got_plt,
|
||||
got_irelative);
|
||||
}
|
||||
|
||||
template<>
|
||||
Output_data_plt_x86_64<64>*
|
||||
Target_x86_64<64>::do_make_data_plt(Layout* layout,
|
||||
Output_data_got<64, false>* got,
|
||||
Output_data_got_plt_x86_64* got_plt,
|
||||
Output_data_space* got_irelative)
|
||||
{
|
||||
if (parameters->options().bndplt())
|
||||
return new Output_data_plt_x86_64_bnd(layout, got, got_plt,
|
||||
got_irelative);
|
||||
else
|
||||
return new Output_data_plt_x86_64_standard<64>(layout, got, got_plt,
|
||||
got_irelative);
|
||||
}
|
||||
|
||||
template<>
|
||||
Output_data_plt_x86_64<32>*
|
||||
Target_x86_64<32>::do_make_data_plt(Layout* layout,
|
||||
Output_data_got<64, false>* got,
|
||||
Output_data_got_plt_x86_64* got_plt,
|
||||
Output_data_space* got_irelative,
|
||||
unsigned int plt_count)
|
||||
{
|
||||
return new Output_data_plt_x86_64_standard<32>(layout, got, got_plt,
|
||||
got_irelative,
|
||||
plt_count);
|
||||
}
|
||||
|
||||
template<>
|
||||
Output_data_plt_x86_64<64>*
|
||||
Target_x86_64<64>::do_make_data_plt(Layout* layout,
|
||||
Output_data_got<64, false>* got,
|
||||
Output_data_got_plt_x86_64* got_plt,
|
||||
Output_data_space* got_irelative,
|
||||
unsigned int plt_count)
|
||||
{
|
||||
if (parameters->options().bndplt())
|
||||
return new Output_data_plt_x86_64_bnd(layout, got, got_plt,
|
||||
got_irelative, plt_count);
|
||||
else
|
||||
return new Output_data_plt_x86_64_standard<64>(layout, got, got_plt,
|
||||
got_irelative,
|
||||
plt_count);
|
||||
}
|
||||
|
||||
// Return the section for TLSDESC relocations.
|
||||
|
||||
template<int size>
|
||||
|
|
|
|||
Loading…
Reference in New Issue