Mercurial > hg > truffle
changeset 1880:60ce9dade348
Merge
author | acorn |
---|---|
date | Tue, 26 Oct 2010 14:43:21 -0400 |
parents | a312a67b32ef (current diff) 9eaf8ba53f3d (diff) |
children | ee0d26abaad3 |
files | |
diffstat | 4 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Oct 25 13:31:55 2010 -0400 +++ b/.hgtags Tue Oct 26 14:43:21 2010 -0400 @@ -122,4 +122,6 @@ 2f25f2b8de2700a1822463b1bd3d02b5e218018f jdk7-b110 07b042e13dde4f3479ba9ec55120fcd5e8623323 jdk7-b111 5511edd5d719f3fc9fdd04879482026a3d2c8652 jdk7-b112 +beef35b96b81129c375d572357fb9548d9020db1 jdk7-b113 +68d6141ea19de3a9ba98ef753f0da41a61f736a0 jdk7-b114 5511edd5d719f3fc9fdd04879482026a3d2c8652 hs20-b01
--- a/make/hotspot_version Mon Oct 25 13:31:55 2010 -0400 +++ b/make/hotspot_version Tue Oct 26 14:43:21 2010 -0400 @@ -35,7 +35,7 @@ HS_MAJOR_VER=20 HS_MINOR_VER=0 -HS_BUILD_NUMBER=01 +HS_BUILD_NUMBER=02 JDK_MAJOR_VER=1 JDK_MINOR_VER=7
--- a/src/share/vm/runtime/arguments.cpp Mon Oct 25 13:31:55 2010 -0400 +++ b/src/share/vm/runtime/arguments.cpp Tue Oct 26 14:43:21 2010 -0400 @@ -2979,6 +2979,13 @@ UseCompressedOops = false; #endif +#if defined(_LP64) + if ((DumpSharedSpaces || RequireSharedSpaces) && UseCompressedOops) { + // Disable compressed oops with shared spaces + UseCompressedOops = false; + } +#endif + // Set object alignment values. set_object_alignment();
--- a/src/share/vm/runtime/globals.hpp Mon Oct 25 13:31:55 2010 -0400 +++ b/src/share/vm/runtime/globals.hpp Tue Oct 26 14:43:21 2010 -0400 @@ -3545,7 +3545,7 @@ product(uintx, SharedDummyBlockSize, 512*M, \ "Size of dummy block used to shift heap addresses (in bytes)") \ \ - product(uintx, SharedReadWriteSize, 12*M, \ + product(uintx, SharedReadWriteSize, NOT_LP64(12*M) LP64_ONLY(13*M), \ "Size of read-write space in permanent generation (in bytes)") \ \ product(uintx, SharedReadOnlySize, 10*M, \