changeset 4759:a3bbc959356e

Merge
author asaha
date Wed, 10 Jul 2013 16:33:14 -0700
parents aaa90a89968d 23eed087177a
children 28e475dfa88b
files .hgtags make/hotspot_version
diffstat 7 files changed, 21 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 09 18:22:46 2013 -0700
+++ b/.hgtags	Wed Jul 10 16:33:14 2013 -0700
@@ -531,5 +531,7 @@
 645b68762a367d82c2b55f76cae431b767bee3ac jdk7u40-b31
 2417fa1acf2ba8521f480f2baef9af279ec2bf15 hs24-b51
 9658c969b7cf0de256691a80f44dcfe73d72a02f jdk7u40-b32
+15706a73a506943059a6bbf59e2ec8866a026114 hs24-b52
+0b9149d22ee08fe13b4f198ff258a1348e27b8b2 jdk7u40-b33
 5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
 f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02
--- a/make/hotspot_version	Tue Jul 09 18:22:46 2013 -0700
+++ b/make/hotspot_version	Wed Jul 10 16:33:14 2013 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=24
 HS_MINOR_VER=45
-HS_BUILD_NUMBER=01
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
--- a/make/linux/makefiles/vm.make	Tue Jul 09 18:22:46 2013 -0700
+++ b/make/linux/makefiles/vm.make	Wed Jul 10 16:33:14 2013 -0700
@@ -102,6 +102,11 @@
 # a time and date.
 vm_version.o: CXXFLAGS += ${JRE_VERSION}
 
+# Large File Support
+ifneq ($(LP64), 1)
+ostream.o: CXXFLAGS += -D_FILE_OFFSET_BITS=64
+endif # ifneq ($(LP64), 1)
+
 ifeq ($(INCLUDE_TRACE), 1)
 CFLAGS += -DINCLUDE_TRACE=1
 endif
--- a/make/solaris/makefiles/vm.make	Tue Jul 09 18:22:46 2013 -0700
+++ b/make/solaris/makefiles/vm.make	Wed Jul 10 16:33:14 2013 -0700
@@ -90,6 +90,11 @@
 # a time and date.
 vm_version.o: CXXFLAGS += ${JRE_VERSION}
 
+# Large File Support
+ifneq ($(LP64), 1)
+ostream.o: CXXFLAGS += -D_FILE_OFFSET_BITS=64
+endif # ifneq ($(LP64), 1)
+
 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
 CFLAGS += $(CFLAGS_WARN)
 
--- a/src/os/solaris/vm/os_solaris.inline.hpp	Tue Jul 09 18:22:46 2013 -0700
+++ b/src/os/solaris/vm/os_solaris.inline.hpp	Wed Jul 10 16:33:14 2013 -0700
@@ -93,7 +93,7 @@
 
 inline struct dirent* os::readdir(DIR* dirp, dirent* dbuf) {
   assert(dirp != NULL, "just checking");
-#if defined(_LP64) || defined(_GNU_SOURCE)
+#if defined(_LP64) || defined(_GNU_SOURCE) || _FILE_OFFSET_BITS==64
   dirent* p;
   int status;
 
@@ -102,9 +102,9 @@
     return NULL;
   } else
     return p;
-#else  // defined(_LP64) || defined(_GNU_SOURCE)
+#else  // defined(_LP64) || defined(_GNU_SOURCE) || _FILE_OFFSET_BITS==64
   return ::readdir_r(dirp, dbuf);
-#endif // defined(_LP64) || defined(_GNU_SOURCE)
+#endif // defined(_LP64) || defined(_GNU_SOURCE) || _FILE_OFFSET_BITS==64
 }
 
 inline int os::closedir(DIR *dirp) {
--- a/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	Tue Jul 09 18:22:46 2013 -0700
+++ b/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	Wed Jul 10 16:33:14 2013 -0700
@@ -152,12 +152,9 @@
     if (card_num < _committed_max_card_num) {
       count = (uint) _card_counts[card_num];
       if (count < G1ConcRSHotCardLimit) {
-        _card_counts[card_num] += 1;
+        _card_counts[card_num] =
+          (jubyte)(MIN2((uintx)(_card_counts[card_num] + 1), G1ConcRSHotCardLimit));
       }
-      assert(_card_counts[card_num] <= G1ConcRSHotCardLimit,
-             err_msg("Refinement count overflow? "
-                     "new count: "UINT32_FORMAT,
-                     (uint) _card_counts[card_num]));
     }
   }
   return count;
--- a/src/share/vm/runtime/arguments.cpp	Tue Jul 09 18:22:46 2013 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Wed Jul 10 16:33:14 2013 -0700
@@ -1505,7 +1505,9 @@
     // By default HeapBaseMinAddress is 2G on all platforms except Solaris x86.
     // G1 currently needs a lot of C-heap, so on Solaris we have to give G1
     // some extra space for the C-heap compared to other collectors.
-    FLAG_SET_ERGO(uintx, HeapBaseMinAddress, 1*G);
+    // Use FLAG_SET_DEFAULT here rather than FLAG_SET_ERGO to make sure that
+    // code that checks for default values work correctly.
+    FLAG_SET_DEFAULT(HeapBaseMinAddress, 1*G);
   }
 }