Module Name: src
Committed By: martin
Date: Thu Mar 23 11:00:03 UTC 2017
Modified Files:
src/sys/arch/sparc64/conf: GENERIC
Log Message:
Comment out PAX_MPROTECT options completely, instead of just turning them
off globaly. This will make the automatic tests not even try to enable
mprotect, which can't work for our current PLT format and shared binaries.
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/sys/arch/sparc64/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.196 src/sys/arch/sparc64/conf/GENERIC:1.197
--- src/sys/arch/sparc64/conf/GENERIC:1.196 Tue Dec 13 20:42:20 2016
+++ src/sys/arch/sparc64/conf/GENERIC Thu Mar 23 11:00:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.196 2016/12/13 20:42:20 christos Exp $
+# $NetBSD: GENERIC,v 1.197 2017/03/23 11:00:03 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.196 $"
+#ident "GENERIC-$Revision: 1.197 $"
maxusers 64
@@ -1024,6 +1024,6 @@ options PAX_ASLR_DEBUG=1 # PaX ASLR deb
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
# XXX: there is no PLT format for sparc64 that cooperates with
# MPROTECT, so disable it for now
-options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
-options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
+# options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
+# options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
