# HG changeset patch
# User andrew
# Date 1436404311 -3600
# Node ID 70ef7b7a3b6d7e5ab3b59969849a42e7e15241d9
# Parent  4a2acc0b4bb92c0e0763b87bf97bb43485d7f1c5# Parent  e3845b02b0d1bfe203ab4783941d852a2b2d412d
Merge jdk7u85-b00

diff -r 4a2acc0b4bb9 -r 70ef7b7a3b6d .hgtags
--- a/.hgtags	Wed Jul 08 13:17:29 2015 +0100
+++ b/.hgtags	Thu Jul 09 02:11:51 2015 +0100
@@ -634,3 +634,4 @@
 458545155c9326c27b4e84a8a087f4419e8f122e jdk7u80-b32
 88ad67ad5b51c1e7316828de177808d4776b5357 icedtea-2.6pre23
 dbfa75121acab9c4dfbf5b28e3eba0e58905c4ef icedtea-2.6pre24
+8d08525bb2541367a4908a5f97298e0b21c12280 jdk7u85-b00
diff -r 4a2acc0b4bb9 -r 70ef7b7a3b6d make/Defs-internal.gmk
--- a/make/Defs-internal.gmk	Wed Jul 08 13:17:29 2015 +0100
+++ b/make/Defs-internal.gmk	Thu Jul 09 02:11:51 2015 +0100
@@ -307,10 +307,12 @@
 ifndef PAX_COMMAND
   PAX_COMMAND = /usr/sbin/paxmark.sh
 endif
+
+# Command arguments to PaX mark the VM
 ifeq ($(ARCH), i586)
-  PAX_COMMAND_ARGS="-msp"
+  PAX_COMMAND_ARGS="-vmsp"
 else
-  PAX_COMMAND_ARGS="-m"
+  PAX_COMMAND_ARGS="-vm"
 endif
 
 # Common make arguments (supplied to all component builds)