Mercurial > hg > truffle

changeset 11968:0f98cc013b21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author fparain
date Wed, 31 Jul 2013 08:28:18 -0700
parents d90d1b96b65b (diff) f9ee986a9fea (current diff)
children da839a3c5735
files
diffstat 4 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 30 14:14:25 2013 -0700
+++ b/.hgtags	Wed Jul 31 08:28:18 2013 -0700
@@ -361,3 +361,5 @@
 2b9946e10587f74ef75ae8145bea484df4a2738b hs25-b41
 81b6cb70717c66375846b78bb174594ec3aa998e jdk8-b99
 9f71e36a471ae4a668e08827d33035963ed10c08 hs25-b42
+5787fac72e760c6a5fd9efa113b0c75caf554136 jdk8-b100
+46487ba40ff225654d0c51787ed3839bafcbd9f3 hs25-b43
--- a/make/hotspot_version	Tue Jul 30 14:14:25 2013 -0700
+++ b/make/hotspot_version	Wed Jul 31 08:28:18 2013 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=43
+HS_BUILD_NUMBER=44
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
--- a/src/cpu/sparc/vm/c2_globals_sparc.hpp	Tue Jul 30 14:14:25 2013 -0700
+++ b/src/cpu/sparc/vm/c2_globals_sparc.hpp	Wed Jul 31 08:28:18 2013 -0700
@@ -42,7 +42,7 @@
 #else
 define_pd_global(bool, ProfileInterpreter,           true);
 #endif // CC_INTERP
-define_pd_global(bool, TieredCompilation,            false);
+define_pd_global(bool, TieredCompilation,            trueInTiered);
 define_pd_global(intx, CompileThreshold,             10000);
 define_pd_global(intx, BackEdgeThreshold,            140000);
 
--- a/src/cpu/x86/vm/c2_globals_x86.hpp	Tue Jul 30 14:14:25 2013 -0700
+++ b/src/cpu/x86/vm/c2_globals_x86.hpp	Wed Jul 31 08:28:18 2013 -0700
@@ -44,7 +44,7 @@
 #else
 define_pd_global(bool, ProfileInterpreter,           true);
 #endif // CC_INTERP
-define_pd_global(bool, TieredCompilation,            false);
+define_pd_global(bool, TieredCompilation,            trueInTiered);
 define_pd_global(intx, CompileThreshold,             10000);
 define_pd_global(intx, BackEdgeThreshold,            100000);