Mercurial > hg > release > icedtea7-forest-2.5 > hotspot

changeset 5844:235355f70290

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OPENJDK7-03: Only apply PaX-marking when needed by a running PaX kernel Reviewed-by: omajid
author andrew
date Tue, 07 Jul 2015 14:29:19 +0100
parents d095415c0700
children 383de087ee57
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	Mon Jul 06 19:41:23 2015 +0100
+++ b/make/linux/makefiles/buildtree.make	Tue Jul 07 14:29:19 2015 +0100
@@ -477,7 +477,9 @@
 	echo "fi"; \
 	echo ""; \
 	echo "if [ -x \"$(PAX_COMMAND)\" ]; then "; \
-	echo "  $(PAX_COMMAND) $(PAX_COMMAND_ARGS) ./\$${GAMMA_PROG}"; \
+	echo "  if cat /proc/self/status | grep '^PaX' > /dev/null ; then "; \
+	echo "    $(PAX_COMMAND) $(PAX_COMMAND_ARGS) ./\$${GAMMA_PROG}"; \
+	echo "  fi"; \
 	echo "fi"; \
 	echo ""; \
 	echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \