Mercurial > hg > openjdk > jdk6
changeset 97:41144cab872f jdk6-b36
OPENJDK6-58: Allow OpenJDK to build on PaX-enabled kernels
Reviewed-by: omajid
| author | andrew |
|---|---|
| date | Fri, 10 Jul 2015 13:58:51 +0100 |
| parents | 93696060403c |
| children | 82c747145780 |
| files | make/Defs-internal.gmk |
| diffstat | 1 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Defs-internal.gmk Wed Apr 15 02:12:32 2015 +0100 +++ b/make/Defs-internal.gmk Fri Jul 10 13:58:51 2015 +0100 @@ -139,6 +139,18 @@ ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist endif +# Command to PaX mark the VM +ifndef PAX_COMMAND + PAX_COMMAND = /usr/sbin/paxmark.sh +endif + +# Command arguments to PaX mark the VM +ifeq ($(ARCH), i586) + PAX_COMMAND_ARGS="-vmsp" +else + PAX_COMMAND_ARGS="-vm" +endif + # Common make arguments (supplied to all component builds) COMMON_BUILD_ARGUMENTS = \ JDK_TOPDIR=$(ABS_JDK_TOPDIR) \ @@ -154,7 +166,9 @@ JDK_MKTG_VERSION=$(JDK_MKTG_VERSION) \ JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION) \ JDK_MINOR_VERSION=$(JDK_MINOR_VERSION) \ - JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) + JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \ + PAX_COMMAND=$(PAX_COMMAND) \ + PAX_COMMAND_ARGS=$(PAX_COMMAND_ARGS) ifdef ARCH_DATA_MODEL COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)