# HG changeset patch
# User andrew
# Date 1435964097 -3600
# Node ID 48ade3446fc4de811e46691aee860ba9e0f6dc29
# Parent  7b756c5d638c82e564c11dbdc8a3b10b5e17f62b
OPENJDK7-01: Allow OpenJDK to build on PaX-enabled kernels
Reviewed-by: omajid

diff -r 7b756c5d638c -r 48ade3446fc4 make/Defs-internal.gmk
--- a/make/Defs-internal.gmk	Fri Jul 03 23:53:28 2015 +0100
+++ b/make/Defs-internal.gmk	Fri Jul 03 23:54:57 2015 +0100
@@ -303,6 +303,13 @@
   ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
 endif
 
+# Command arguments to PaX mark the VM
+ifeq ($(ARCH), i586)
+  PAX_COMMAND_ARGS="-vmsp"
+else
+  PAX_COMMAND_ARGS="-vm"
+endif
+
 # Common make arguments (supplied to all component builds)
 COMMON_BUILD_ARGUMENTS = \
     JDK_TOPDIR=$(ABS_JDK_TOPDIR) \
@@ -348,6 +355,12 @@
   COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)"
 endif
 
+ifdef PAX_COMMAND
+  COMMON_BUILD_ARGUMENTS += \
+    PAX_COMMAND=$(PAX_COMMAND) \
+    PAX_COMMAND_ARGS=$(PAX_COMMAND_ARGS)
+endif
+
 # When all repos support FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES,
 # then these can be set here:
 #ifdef FULL_DEBUG_SYMBOLS