From: guenther <guenther@openbsd.org>
Date: Wed, 10 Aug 2016 20:54:35 +0000 (+0000)
Subject: auto-dope-slap: mips64 has 16K pages, not 4K.  With that fixed, enable RELRO
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9c3ee2890e0af2791e1e870d63954bb4890da5d1;p=openbsd

auto-dope-slap: mips64 has 16K pages, not 4K.  With that fixed, enable RELRO

Per feedback from kettenis@, Miod, and deraadt@, the padding between
text and rodata will be retained for consistency with other archs,
to minimize reliance on the R4000 EOP bug workaround, and to enable
possible future work.

ok deraadt@
---

diff --git a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf64btsmip_obsd.sh b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf64btsmip_obsd.sh
index 71dad530261..ab5bca3fa45 100644
--- a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf64btsmip_obsd.sh
+++ b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf64btsmip_obsd.sh
@@ -1,6 +1,6 @@
 . ${srcdir}/emulparams/elf64btsmip.sh
 MAXPAGESIZE=0x10000
-COMMONPAGESIZE=0x1000
+COMMONPAGESIZE=0x4000
 TEXT_START_ADDR="0x10000000"
 . ${srcdir}/emulparams/elf_obsd.sh
 # XXX causes GOT oflows
diff --git a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf64ltsmip_obsd.sh b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf64ltsmip_obsd.sh
index dfe851cd26d..e88dcf66815 100644
--- a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf64ltsmip_obsd.sh
+++ b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf64ltsmip_obsd.sh
@@ -1,6 +1,6 @@
 . ${srcdir}/emulparams/elf64ltsmip.sh
 MAXPAGESIZE=0x10000
-COMMONPAGESIZE=0x1000
+COMMONPAGESIZE=0x4000
 TEXT_START_ADDR="0x10000000"
 . ${srcdir}/emulparams/elf_obsd.sh
 # XXX causes GOT oflows
diff --git a/gnu/usr.bin/binutils-2.17/ld/ldmain.c b/gnu/usr.bin/binutils-2.17/ld/ldmain.c
index fc82e3e401b..d9600883484 100644
--- a/gnu/usr.bin/binutils-2.17/ld/ldmain.c
+++ b/gnu/usr.bin/binutils-2.17/ld/ldmain.c
@@ -299,7 +299,7 @@ main (int argc, char **argv)
   link_info.new_dtags = FALSE;
   link_info.combreloc = TRUE;
   link_info.eh_frame_hdr = FALSE;
-#if defined(__mips64__) || defined(__m88k__)
+#if defined(__m88k__)
   link_info.relro = FALSE;
 #else
   link_info.relro = TRUE;