Mercurial > hg > arm32-8u40
changeset 7117:12478c5eb000
Merge
| author | asaha |
|---|---|
| date | Fri, 24 Oct 2014 17:09:30 -0700 |
| parents | 37179dcf830a (diff) c2844108a708 (current diff) |
| children | 5ca2ea5eeff0 |
| files | .hgtags agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java make/hotspot_version src/share/vm/gc_implementation/g1/heapRegionSeq.cpp src/share/vm/gc_implementation/g1/heapRegionSeq.hpp src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp src/share/vm/runtime/arguments.cpp src/share/vm/services/memPtr.cpp src/share/vm/services/memPtr.hpp src/share/vm/services/memPtrArray.hpp src/share/vm/services/memRecorder.cpp src/share/vm/services/memRecorder.hpp src/share/vm/services/memSnapshot.cpp src/share/vm/services/memSnapshot.hpp src/share/vm/services/memTrackWorker.cpp src/share/vm/services/memTrackWorker.hpp test/compiler/intrinsics/mathexact/sanity/Verifier.java test/testlibrary/com/oracle/java/testlibrary/DynamicVMOptionChecker.java test/testlibrary/com/oracle/java/testlibrary/TestDynamicVMOption.java |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Oct 23 12:02:08 2014 -0700 +++ b/.hgtags Fri Oct 24 17:09:30 2014 -0700 @@ -556,3 +556,4 @@ 1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10 f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11 +b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
--- a/make/hotspot_version Thu Oct 23 12:02:08 2014 -0700 +++ b/make/hotspot_version Fri Oct 24 17:09:30 2014 -0700 @@ -34,8 +34,8 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 -HS_MINOR_VER=40 -HS_BUILD_NUMBER=15 +HS_MINOR_VER=45 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=8
--- a/src/share/vm/runtime/arguments.cpp Thu Oct 23 12:02:08 2014 -0700 +++ b/src/share/vm/runtime/arguments.cpp Fri Oct 24 17:09:30 2014 -0700 @@ -2283,7 +2283,7 @@ "G1ConcMarkStepDurationMillis"); status = status && verify_interval(G1ConcRSHotCardLimit, 0, max_jubyte, "G1ConcRSHotCardLimit"); - status = status && verify_interval(G1ConcRSLogCacheSize, 0, 31, + status = status && verify_interval(G1ConcRSLogCacheSize, 0, 27, "G1ConcRSLogCacheSize"); status = status && verify_interval(StringDeduplicationAgeThreshold, 1, markOopDesc::max_age, "StringDeduplicationAgeThreshold");