diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-08-23 15:19:33 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-08-23 15:19:33 +0000 |
| commit | 6a9ed33e114ae2e448fc36528a24835a7997807f (patch) | |
| tree | 52e875fa07d330a895e9dc18aae70e4a5e121a51 | |
| parent | 18a239bd414db04d8b6460922ceae4272e39db9d (diff) | |
Enable missing code to fully enable the Secure-PLT ABI and clean up the
remaining commented out variable settings. We'll continue to use the
same layout for both BSS-PLT and Secure-PLT since supporting the more
relro friendly layout that Linux uses isn't compatible with our way of
making the PLT and GOT read-only.
| -rw-r--r-- | gnu/usr.bin/binutils-2.17/ld/emulparams/elf32ppc_obsd.sh | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf32ppc_obsd.sh b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf32ppc_obsd.sh index d15403925f1..5fbc163f875 100644 --- a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf32ppc_obsd.sh +++ b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf32ppc_obsd.sh @@ -1,14 +1,7 @@ -# . ${srcdir}/emulparams/elf32ppc.sh . ${srcdir}/emulparams/elf32ppccommon.sh -## # Yes, we want duplicate .got and .plt sections. The linker chooses the -## # appropriate one magically in ppc_after_open -## DATA_GOT= -## SDATA_GOT= -## SEPARATE_GOTPLT=0 +# We deliberately keep the traditional OpenBSD W^X layout for both the +# old BSS-PLT and the new Secure-PLT ABI. BSS_PLT= -## GOT=".got ${RELOCATING-0} : SPECIAL { *(.got) }" -## PLT=".plt ${RELOCATING-0} : SPECIAL { *(.plt) }" -## GOTPLT="${PLT}" -## OTHER_TEXT_SECTIONS="*(.glink)" -## EXTRA_EM_FILE=ppc32elf +OTHER_TEXT_SECTIONS="*(.glink)" +EXTRA_EM_FILE=ppc32elf . ${srcdir}/emulparams/elf_obsd.sh |