Mercurial > hg > arm32-8u40
changeset 7128:7622232b7efa
Merge
author | asaha |
---|---|
date | Wed, 17 Dec 2014 09:10:57 -0800 |
parents | 01850e3a5b06 (diff) c4f1e23c4139 (current diff) |
children | 02e2c04a3289 |
files | .hgtags make/hotspot_version src/share/vm/code/dependencies.cpp src/share/vm/code/dependencies.hpp src/share/vm/oops/instanceKlass.cpp src/share/vm/oops/instanceKlass.hpp |
diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Dec 16 14:02:00 2014 -0800 +++ b/.hgtags Wed Dec 17 09:10:57 2014 -0800 @@ -577,3 +577,5 @@ fc1f9b67fd8c5d5cd94ecc03569d93e7ce7fb574 jdk8u40-b17 bc5a90a4db47f1c497d7894434c42325f595cd02 hs25.40-b22 31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18 +b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00 +41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01
--- a/make/hotspot_version Tue Dec 16 14:02:00 2014 -0800 +++ b/make/hotspot_version Wed Dec 17 09:10:57 2014 -0800 @@ -34,8 +34,8 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 -HS_MINOR_VER=40 -HS_BUILD_NUMBER=22 +HS_MINOR_VER=45 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=8
--- a/src/share/vm/runtime/arguments.cpp Tue Dec 16 14:02:00 2014 -0800 +++ b/src/share/vm/runtime/arguments.cpp Wed Dec 17 09:10:57 2014 -0800 @@ -2310,7 +2310,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");