changeset 4611:d8a09bbba79a

Fix merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 14 Feb 2012 11:32:21 +0100
parents 717589e14dbd
children d8ff6f2bcabd
files src/cpu/x86/vm/c2_globals_x86.hpp
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/c2_globals_x86.hpp	Tue Feb 14 11:28:57 2012 +0100
+++ b/src/cpu/x86/vm/c2_globals_x86.hpp	Tue Feb 14 11:32:21 2012 +0100
@@ -39,6 +39,7 @@
 define_pd_global(bool, PreferInterpreterNativeStubs, false);
 define_pd_global(bool, ProfileTraps,                 true);
 define_pd_global(bool, UseOnStackReplacement,        true);
+define_pd_global(intx, TypeProfileWidth,             2   );
 #ifdef CC_INTERP
 define_pd_global(bool, ProfileInterpreter,           false);
 #else