Mercurial > hg > openjdk > bsd-port
changeset 1326:014244c4a547
Merge from main OpenJDK repository
| author | Greg Lewis <glewis@eyesbeyond.com> |
|---|---|
| date | Sat, 12 Dec 2015 22:19:34 -0800 |
| parents | 2be0ab1a24b2 (diff) 1727e624ac22 (current diff) |
| children | 783b3540e209 |
| files | .hgtags make/Defs-internal.gmk |
| diffstat | 2 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sun Apr 19 13:24:06 2015 -0700 +++ b/.hgtags Sat Dec 12 22:19:34 2015 -0800 @@ -595,3 +595,9 @@ 4da82068f37e17858d318d24a5a6284d48627e68 jdk7u80-b14 611f7d38d9346243b558dc78409b813241eb426f jdk7u80-b30 f19659de2034611095d307ccc68f777abc8b008e jdk7u80-b15 +458545155c9326c27b4e84a8a087f4419e8f122e jdk7u80-b32 +3b6a81ffb63654d5148168c2ba00288dfc833fe4 jdk7u85-b00 +76707a6d46afa9a057756f4d3614c0da1320499c jdk7u85-b01 +bc294917c5eb1ea2e655a2fcbd8fbb2e7cbd3313 jdk7u85-b02 +63d687368ce5bca36efbe48db2cf26df171b162d jdk7u91-b00 +03b03194afbe87a049a1c6d83f49788602c363d8 jdk7u91-b01
--- a/make/Defs-internal.gmk Sun Apr 19 13:24:06 2015 -0700 +++ b/make/Defs-internal.gmk Sat Dec 12 22:19:34 2015 -0800 @@ -303,6 +303,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) \ @@ -322,7 +334,9 @@ JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \ PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \ PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ - PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) + PREVIOUS_MICRO_VERSION=$(PREVIOUS_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)