summary refs log tree commit diff
path: root/pkgs/development/compilers/openjdk/paxctl.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/compilers/openjdk/paxctl.patch')
-rw-r--r--pkgs/development/compilers/openjdk/paxctl.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/pkgs/development/compilers/openjdk/paxctl.patch b/pkgs/development/compilers/openjdk/paxctl.patch
deleted file mode 100644
index 12528a601cc8..000000000000
--- a/pkgs/development/compilers/openjdk/paxctl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/hotspot/make/linux/makefiles/launcher.make b/hotspot/make/linux/makefiles/launcher.make
-index 34bbcd6..41b9332 100644
---- a/hotspot/make/linux/makefiles/launcher.make
-+++ b/hotspot/make/linux/makefiles/launcher.make
-@@ -83,6 +83,8 @@ $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
- 	$(QUIETLY) echo Linking launcher...
- 	$(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)
- 	$(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER)
-+	paxctl -c $(LAUNCHER)
-+	paxctl -zex -XXX_PAXFLAGS_XXX $(LAUNCHER)
- 	$(QUIETLY) $(LINK_LAUNCHER/POST_HOOK)
- 
- $(LAUNCHER): $(LAUNCHER_SCRIPT)
-diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk
-index 091800d..1de8cb4 100644
---- a/jdk/make/common/Program.gmk
-+++ b/jdk/make/common/Program.gmk
-@@ -60,6 +60,10 @@ ACTUAL_PROGRAM      = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME)
- program_default_rule: all
- 
- program: $(ACTUAL_PROGRAM)
-+	if [[ "$(PROGRAM)" = "java" ]]; then \
-+		paxctl -c $(ACTUAL_PROGRAM); \
-+		paxctl -zex -XXX_PAXFLAGS_XXX $(ACTUAL_PROGRAM); \
-+	fi
- 
- # Work-around for missing processor specific mapfiles
- ifndef CROSS_COMPILE_ARCH