Mercurial > hg > openjdk > jdk7u > hotspot
changeset 3421:dc978aca3ceb jdk7u5-b02
Merge
author | asaha |
---|---|
date | Thu, 12 Apr 2012 15:50:35 -0700 |
parents | dcf91dc1f50e (current diff) c7c6b00122cf (diff) |
children | db2b0f27fea1 dcfa1289a007 62c7660a9824 |
files | .hgtags make/hotspot_version |
diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Apr 11 17:38:20 2012 -0700 +++ b/.hgtags Thu Apr 12 15:50:35 2012 -0700 @@ -276,3 +276,5 @@ f1b786625e0c2ce215d70dda637a127edb2688f2 jdk7u4-b18 1834c6835b75ed0c0f6fdb55a4ae56cc82e0f15c hs23-b20 a1292d4e07097cf68addadca35553fd1255dc555 jdk7u4-b19 +34fce1d343b0d9f5e1e5ea30d93e840d260f3dce hs23-b21 +ad6f5eaa165edc94caaa0ac582828718a63a3d02 jdk7u4-b20
--- a/src/cpu/sparc/vm/c2_globals_sparc.hpp Wed Apr 11 17:38:20 2012 -0700 +++ b/src/cpu/sparc/vm/c2_globals_sparc.hpp Thu Apr 12 15:50:35 2012 -0700 @@ -42,7 +42,7 @@ #else define_pd_global(bool, ProfileInterpreter, true); #endif // CC_INTERP -define_pd_global(bool, TieredCompilation, trueInTiered); +define_pd_global(bool, TieredCompilation, false); define_pd_global(intx, CompileThreshold, 10000); define_pd_global(intx, BackEdgeThreshold, 140000);
--- a/src/cpu/x86/vm/c2_globals_x86.hpp Wed Apr 11 17:38:20 2012 -0700 +++ b/src/cpu/x86/vm/c2_globals_x86.hpp Thu Apr 12 15:50:35 2012 -0700 @@ -44,7 +44,7 @@ #else define_pd_global(bool, ProfileInterpreter, true); #endif // CC_INTERP -define_pd_global(bool, TieredCompilation, trueInTiered); +define_pd_global(bool, TieredCompilation, false); define_pd_global(intx, CompileThreshold, 10000); define_pd_global(intx, BackEdgeThreshold, 100000);