Mercurial > hg > openjdk > bsd-port

changeset 1318:efa50fef5637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8133966: Allow OpenJDK to build on PaX-enabled kernels Reviewed-by: omajid
author andrew
date Fri, 03 Jul 2015 23:54:57 +0100
parents 7b756c5d638c
children 3b6a81ffb636
files make/Defs-internal.gmk
diffstat 1 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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