OpenJDK / jdk8 / jdk8 / hotspot
changeset 5807:32f017489ba5 hs25-b69
Merge
| author | amurillo |
|---|---|
| date | Tue, 28 Jan 2014 15:00:35 -0800 |
| parents | 58879cd9f8df 2185d483f5f8 |
| children | 1d8728efc05f |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/hotspot_version Tue Jan 28 09:51:25 2014 -0800 +++ b/make/hotspot_version Tue Jan 28 15:00:35 2014 -0800 @@ -35,7 +35,7 @@ HS_MAJOR_VER=25 HS_MINOR_VER=0 -HS_BUILD_NUMBER=68 +HS_BUILD_NUMBER=69 JDK_MAJOR_VER=1 JDK_MINOR_VER=8
--- a/src/share/vm/opto/c2_globals.hpp Tue Jan 28 09:51:25 2014 -0800 +++ b/src/share/vm/opto/c2_globals.hpp Tue Jan 28 15:00:35 2014 -0800 @@ -445,7 +445,7 @@ notproduct(bool, PrintEliminateLocks, false, \ "Print out when locks are eliminated") \ \ - product(bool, EliminateAutoBox, true, \ + product(bool, EliminateAutoBox, false, \ "Control optimizations for autobox elimination") \ \ experimental(bool, UseImplicitStableValues, false, \