Mercurial > hg > icedtea7-forest
changeset 1384:70ef7b7a3b6d
Merge jdk7u85-b00
| author | andrew |
|---|---|
| date | Thu, 09 Jul 2015 02:11:51 +0100 |
| parents | 4a2acc0b4bb9 (current diff) e3845b02b0d1 (diff) |
| children | a0725da9d93d |
| files | .hgtags make/Defs-internal.gmk |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)