Mercurial > hg > openjdk > bsd-port > hotspot
changeset 5893:ea2051eb6ee8 jdk7u85-b00
8133970: Only apply PaX-marking when needed by a running PaX kernel
Reviewed-by: aph
author | andrew |
---|---|
date | Tue, 07 Jul 2015 14:29:19 +0100 |
parents | 28fcd793e509 |
children | 1c6c2bdf4321 |
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 22:25:26 2015 +0100 +++ b/make/linux/makefiles/buildtree.make Tue Jul 07 14:29:19 2015 +0100 @@ -460,7 +460,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 "; \