changeset 1830:03cb176986bc

Merge.
author Andrew John Hughes <ahughes@redhat.com>
date Sat, 23 May 2009 00:41:28 +0100
parents e160d9e94f4e (diff) 23732a06b248 (current diff)
children 5744d25c5a37
files ChangeLog
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat May 23 00:26:46 2009 +0200
+++ b/ChangeLog	Sat May 23 00:41:28 2009 +0100
@@ -1,9 +1,14 @@
-2009-05-22  Mark Wielaard  <mark@klomp.org>
+2009-05-22  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/xrender/icedtea-002.patch: Correct rebase. Add
 	Java_sun_java2d_x11_XSurfaceData_isDrawableValid and
 	Java_sun_java2d_x11_XSurfaceData_setInvalid back.
 
+2009-05-22  Mark Wielaard  <mark@klomp.org>
+
+	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp:
+	Define InlineSmallCode, using x86 value to begin with.
+
 2009-05-22  Lillian Angel  <langel@redhat.com>
 
 	* Makefile.am: Fixed typo.
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Sat May 23 00:26:46 2009 +0200
+++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Sat May 23 00:41:28 2009 +0100
@@ -44,6 +44,7 @@
 define_pd_global(uintx, NewSize,              ScaleForWordSize(1024 * K));
 #endif // _LP64
 define_pd_global(intx,  InlineFrequencyCount, 100);
+define_pd_global(intx,  InlineSmallCode,      1000);
 define_pd_global(intx,  PreInflateSpin,       10);
 
 define_pd_global(intx,  StackYellowPages,     2);