# HG changeset patch
# User andrew
# Date 1392844079 0
# Node ID b028e58c1b77759531652b7ec81764f3c05ec96c
# Parent  0af208754134a8929e336028991fe78764d664e1
PR1679: Allow OpenJDK to build on PaX-enabled kernels

diff -r 0af208754134 -r b028e58c1b77 make/Defs-internal.gmk
--- a/make/Defs-internal.gmk	Wed Jan 29 10:01:15 2014 +0000
+++ b/make/Defs-internal.gmk	Wed Feb 19 21:07:59 2014 +0000
@@ -303,6 +303,16 @@
   ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
 endif
 
+# Command to PaX mark the VM
+ifndef PAX_COMMAND
+  PAX_COMMAND = /usr/sbin/paxmark.sh
+endif
+ifeq ($(ARCH), i586)
+  PAX_COMMAND_ARGS="-msp"
+else
+  PAX_COMMAND_ARGS="-m"
+endif
+
 # Common make arguments (supplied to all component builds)
 COMMON_BUILD_ARGUMENTS = \
     JDK_TOPDIR=$(ABS_JDK_TOPDIR) \
@@ -323,7 +333,9 @@
     PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \
     PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
     PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \
-    STATIC_CXX=$(STATIC_CXX)
+    STATIC_CXX=$(STATIC_CXX) \
+    PAX_COMMAND=$(PAX_COMMAND) \
+    PAX_COMMAND_ARGS=$(PAX_COMMAND_ARGS)
 
 ifdef ARCH_DATA_MODEL
   COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)