[src/trunk]: src/sys/arch/sparc64/conf Comment out PAX_MPROTECT options compl...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3569e088d6d8
branches:  trunk
changeset: 352263:3569e088d6d8
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Mar 23 11:00:03 2017 +0000

description:
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.

diffstat:

 sys/arch/sparc64/conf/GENERIC |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r aac338c7102f -r 3569e088d6d8 sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC     Thu Mar 23 08:31:00 2017 +0000
+++ b/sys/arch/sparc64/conf/GENERIC     Thu Mar 23 11:00:03 2017 +0000
@@ -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 @@
 
 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_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