Mercurial > hg > openjdk > jdk6 > hotspot

changeset 4101:0eaa8e875603

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OPENJDK6-59: Only apply PaX-marking when needed by a running PaX kernel Reviewed-by: omajid
author andrew
date Fri, 10 Jul 2015 15:06:43 +0100
parents 29eff71dde21
children 082b55919253
files make/linux/makefiles/buildtree.make
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/linux/makefiles/buildtree.make	Fri Jul 10 13:59:49 2015 +0100
+++ b/make/linux/makefiles/buildtree.make	Fri Jul 10 15:06:43 2015 +0100
@@ -435,7 +435,9 @@
 	echo "fi"; \
 	echo ""; \
 	echo "if [ -x \"$(PAX_COMMAND)\" ]; then "; \
-	echo "  $(PAX_COMMAND) $(PAX_COMMAND_ARGS) ./\$${GAMMA_PROG}"; \
+	echo "  if grep '^PaX' /proc/self/status > /dev/null ; then "; \
+	echo "    $(PAX_COMMAND) $(PAX_COMMAND_ARGS) ./\$${GAMMA_PROG}"; \
+	echo "  fi"; \
 	echo "fi"; \
 	echo ""; \
 	echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \