Intra-segment traps instead of nops. Similar to kernel change, further

reduction in nopsleds in code and data segments (if those data segments
ever become X, that is)
ok mlarkin

diff --git a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf_i386_obsd.sh b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf_i386_obsd.sh
index ae7ba0e..22aa8ca 100644 (file)
--- a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf_i386_obsd.sh
+++ b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf_i386_obsd.sh
@@ -1,5 +1,6 @@
 . ${srcdir}/emulparams/elf_i386.sh
 . ${srcdir}/emulparams/elf_obsd.sh
+NOP=0xcccccccc
 
 if test "${LD_FLAG#"${LD_FLAG%pie}"}" = "pie"; then
   TEXT_START_ADDR=0x0

diff --git a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf_x86_64_obsd.sh b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf_x86_64_obsd.sh
index 3689dad..88be7b9 100644 (file)
--- a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf_x86_64_obsd.sh
+++ b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf_x86_64_obsd.sh
@@ -1,2 +1,3 @@
 . ${srcdir}/emulparams/elf_x86_64.sh
 . ${srcdir}/emulparams/elf_obsd.sh
+NOP=0xcccccccc