at 18.03-beta 1.1 kB view raw
1diff --git a/hotspot/make/linux/makefiles/launcher.make b/hotspot/make/linux/makefiles/launcher.make 2index 34bbcd6..41b9332 100644 3--- a/hotspot/make/linux/makefiles/launcher.make 4+++ b/hotspot/make/linux/makefiles/launcher.make 5@@ -83,6 +83,8 @@ $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) 6 $(QUIETLY) echo Linking launcher... 7 $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) 8 $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER) 9+ paxctl -c $(LAUNCHER) 10+ paxctl -zex -XXX_PAXFLAGS_XXX $(LAUNCHER) 11 $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) 12 13 $(LAUNCHER): $(LAUNCHER_SCRIPT) 14diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk 15index 091800d..1de8cb4 100644 16--- a/jdk/make/common/Program.gmk 17+++ b/jdk/make/common/Program.gmk 18@@ -60,6 +60,10 @@ ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME) 19 program_default_rule: all 20 21 program: $(ACTUAL_PROGRAM) 22+ if [[ "$(PROGRAM)" = "java" ]]; then \ 23+ paxctl -c $(ACTUAL_PROGRAM); \ 24+ paxctl -zex -XXX_PAXFLAGS_XXX $(ACTUAL_PROGRAM); \ 25+ fi 26 27 # Work-around for missing processor specific mapfiles 28 ifndef CROSS_COMPILE_ARCH