# HG changeset patch
# User kamg
# Date 1288136908 25200
# Node ID ee0d26abaad3888ae7ac6ecb157ad173bc3b4da6
# Parent  6412b3805cd6440c084fd07058db5df751f2f5fc# Parent  60ce9dade3489661f62140cf2f443ad49fabe996
Merge

diff -r 6412b3805cd6 -r ee0d26abaad3 .hgtags
--- a/.hgtags	Tue Oct 26 14:08:49 2010 -0400
+++ b/.hgtags	Tue Oct 26 16:48:28 2010 -0700
@@ -122,4 +122,6 @@
 2f25f2b8de2700a1822463b1bd3d02b5e218018f jdk7-b110
 07b042e13dde4f3479ba9ec55120fcd5e8623323 jdk7-b111
 5511edd5d719f3fc9fdd04879482026a3d2c8652 jdk7-b112
+beef35b96b81129c375d572357fb9548d9020db1 jdk7-b113
+68d6141ea19de3a9ba98ef753f0da41a61f736a0 jdk7-b114
 5511edd5d719f3fc9fdd04879482026a3d2c8652 hs20-b01
diff -r 6412b3805cd6 -r ee0d26abaad3 make/hotspot_version
--- a/make/hotspot_version	Tue Oct 26 14:08:49 2010 -0400
+++ b/make/hotspot_version	Tue Oct 26 16:48:28 2010 -0700
@@ -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
diff -r 6412b3805cd6 -r ee0d26abaad3 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Tue Oct 26 14:08:49 2010 -0400
+++ b/src/share/vm/runtime/arguments.cpp	Tue Oct 26 16:48:28 2010 -0700
@@ -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();
 
diff -r 6412b3805cd6 -r ee0d26abaad3 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Tue Oct 26 14:08:49 2010 -0400
+++ b/src/share/vm/runtime/globals.hpp	Tue Oct 26 16:48:28 2010 -0700
@@ -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,                                \