diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2016-08-14 04:25:28 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2016-08-14 04:25:28 +0000 |
| commit | 1c0455ddae953b821a9358112b4948e0d63e252a (patch) | |
| tree | 360a41ef2e3212ee3e46f99b76e3b844f15b2377 | |
| parent | e0098e96f1ecd0a3444d6249ca7aaa9af8085854 (diff) | |
Turning off relro shouldn't insert padding into the middle of the relro
section; remove the PAD_GOT0 use that I should have deleted before. This
caused ld.so crashes on arm when building binutils.
critical debugging observations by kettenis@
| -rw-r--r-- | gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc b/gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc index c92ea878340..4d0946eb914 100644 --- a/gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc +++ b/gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc @@ -248,8 +248,6 @@ else fi cat <<EOF -/* DATA_GOT=${DATA_GET+y} SDATA_GOT=${SDATA_GOT+y} SEPARATE_GOTPLT=${SEPARATE_GOTPLT+y} */ -/* DATA_PLT=${DATA_PLT+y} BSS_PLT=${BSS_PLT+y} DATA_NONEXEC_PLT=${DATA_NONEXEC_PLT+y} */ OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", "${LITTLE_OUTPUT_FORMAT}") OUTPUT_ARCH(${OUTPUT_ARCH}) @@ -433,7 +431,6 @@ cat <<EOF ${RELOCATING+${DATARELRO}} ${OTHER_RELRO_SECTIONS} ${TEXT_DYNAMIC-${DYNAMIC}} - ${DATA_GOT+${RELRO_NOW-${PAD_GOT+${PAD_GOT0}}}} /* If PAD_CDTOR, and separate .got and .got.plt sections, CTOR and DTOR are relocated here to receive the same mprotect protection as .got */ ${DATA_GOT+${RELRO_NOW-${SEPARATE_GOTPLT+${PAD_CDTOR+${RELOCATING+${CTOR}}}}}} |