# HG changeset patch
# User andrew
# Date 1436275723 -3600
# Node ID a0ed79d5759f9fb0526e6ee2f9eaf9c6ab9ab425
# Parent  407c890587e6ab75cede44ebd65fea8a501bec7c
OPENJDK7-03: Only apply PaX-marking when needed by a running PaX kernel
Reviewed-by: omajid

diff -r 407c890587e6 -r a0ed79d5759f make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile	Wed Jun 03 20:23:19 2015 -0700
+++ b/make/com/sun/jmx/Makefile	Tue Jul 07 14:28:43 2015 +0100
@@ -123,8 +123,10 @@
 $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
 	$(prep-target)
 	if [ -x $(PAX_COMMAND) ] ; then \
-	  if [ -w $(RMIC_VM) ] ; then \
-	    $(PAX_COMMAND) $(PAX_COMMAND_ARGS) $(RMIC_VM) ; \
+	  if $(CAT) /proc/self/status | grep '^PaX' > /dev/null ; then \
+	    if [ -w $(RMIC_VM) ] ; then \
+	      $(PAX_COMMAND) $(PAX_COMMAND_ARGS) $(RMIC_VM) ; \
+	    fi ; \
 	  fi ; \
 	fi
 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \