/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jan 13 13:11:02 PST 2010
changeset a939ca5b49d5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a939ca5b49d5
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 11 21:37:57 2010 +0000
Bump to HotSpot 16 build 13.
2010-01-11 Andrew John Hughes <ahughes at redhat.com>
Bump to latest HotSpot 16 (b13).
* patches/icedtea-memory-limits.patch: Moved to HotSpot-
specific directories.
* Makefile.am: Use new memory-limits patches.
* hotspot.map: Bump to HotSpot 16 b13.
* patches/hotspot/hs16/icedtea-params-cast-size_t.patch,
* patches/hotspot/original/memory-limits.patch: Recreated for
the new build.
changeset e3fbdd21b1fa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e3fbdd21b1fa
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 11 22:29:53 2010 +0000
Add missing memory limits patch for HotSpot 16.
2010-01-11 Andrew John Hughes <ahughes at redhat.com>
* patches/hotspot/hs16/memory-limits.patch: Add
HotSpot 16 version of memory limits patch.
changeset a578b17f5853 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a578b17f5853
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 13 21:14:16 2010 +0000
Patch Shark to build against hs16 and remove dead platform_zero
symlink.
2010-01-11 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Remove redundant platform_zero
symlink. Add new Shark patch.
* patches/hotspot/hs16/shark.patch: Replace 32-bit
DefaultMaxRAM with 64-bit MaxRAM when building HotSpot 16
b13.
diffstat:
8 files changed, 115 insertions(+), 57 deletions(-)
ChangeLog | 25 +++++++
Makefile.am | 6 -
hotspot.map | 2
patches/hotspot/hs16/icedtea-params-cast-size_t.patch | 60 ++++++++---------
patches/hotspot/hs16/memory-limits.patch | 24 ++++++
patches/hotspot/hs16/shark.patch | 9 ++
patches/hotspot/original/memory-limits.patch | 23 ++++++
patches/icedtea-memory-limits.patch | 23 ------
diffs (333 lines):
diff -r 8577904b8e6f -r a578b17f5853 ChangeLog
--- a/ChangeLog Mon Jan 11 20:12:43 2010 +0000
+++ b/ChangeLog Wed Jan 13 21:14:16 2010 +0000
@@ -1,3 +1,28 @@ 2010-01-11 Andrew John Hughes <ahughes@
+2010-01-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Remove redundant platform_zero symlink.
+ Add new Shark patch.
+ * patches/hotspot/hs16/shark.patch:
+ Replace 32-bit DefaultMaxRAM with 64-bit
+ MaxRAM when building HotSpot 16 b13.
+
+2010-01-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/hs16/memory-limits.patch:
+ Add HotSpot 16 version of memory limits patch.
+
+2010-01-11 Andrew John Hughes <ahughes at redhat.com>
+
+ Bump to latest HotSpot 16 (b13).
+ * patches/icedtea-memory-limits.patch:
+ Moved to HotSpot-specific directories.
+ * Makefile.am: Use new memory-limits patches.
+ * hotspot.map: Bump to HotSpot 16 b13.
+ * patches/hotspot/hs16/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/original/memory-limits.patch:
+ Recreated for the new build.
+
2010-01-11 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-libraries.patch:
diff -r 8577904b8e6f -r a578b17f5853 Makefile.am
--- a/Makefile.am Mon Jan 11 20:12:43 2010 +0000
+++ b/Makefile.am Wed Jan 13 21:14:16 2010 +0000
@@ -223,7 +223,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-gcc-suffix.patch \
patches/icedtea-gcc-suffix-hotspot.patch \
patches/icedtea-bytebuffer-compact.patch \
- patches/icedtea-memory-limits.patch \
+ patches/hotspot/$(HSBUILD)/memory-limits.patch \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
@@ -350,7 +350,8 @@ endif
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
- patches/hotspot/$(HSBUILD)/zero.patch
+ patches/hotspot/$(HSBUILD)/zero.patch \
+ patches/hotspot/$(HSBUILD)/shark.patch
else
ICEDTEA_PATCHES += patches/hotspot/original/icedtea-6778662-lib64.patch \
patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
@@ -835,7 +836,6 @@ stamps/ports.stamp: stamps/replace-hotsp
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/$(HOTSPOT_MAKE_DIR)#"); \
cp -rv $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/$(HOTSPOT_MAKE_DIR)/linux
if ! test "x$(WITH_CACAO)" = "xno" ; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \
ln -sf $(abs_top_builddir)/jvm.cfg \
diff -r 8577904b8e6f -r a578b17f5853 hotspot.map
--- a/hotspot.map Mon Jan 11 20:12:43 2010 +0000
+++ b/hotspot.map Wed Jan 13 21:14:16 2010 +0000
@@ -1,2 +1,2 @@
# version url changeset md5sum
-hs16 http://hg.openjdk.java.net/hsx/hsx16/master 6bdfda9a7120 e194a7baefb2f55e21a280276a11b49a
+hs16 http://hg.openjdk.java.net/hsx/hsx16/master 62926c7f67a3 d683eb501e7ce710198f20f0c127ebbb
diff -r 8577904b8e6f -r a578b17f5853 patches/hotspot/hs16/icedtea-params-cast-size_t.patch
--- a/patches/hotspot/hs16/icedtea-params-cast-size_t.patch Mon Jan 11 20:12:43 2010 +0000
+++ b/patches/hotspot/hs16/icedtea-params-cast-size_t.patch Wed Jan 13 21:14:16 2010 +0000
@@ -1,7 +1,7 @@ diff -Nru openjdk.orig/hotspot/src/share
diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2009-10-20 22:59:56.000000000 +0100
-@@ -940,7 +940,7 @@
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2010-01-11 20:57:36.000000000 +0000
+@@ -941,7 +941,7 @@
if (free_percentage < desired_free_percentage) {
size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
assert(desired_capacity >= capacity(), "invalid expansion size");
@@ -10,7 +10,7 @@ diff -Nru openjdk.orig/hotspot/src/share
}
if (expand_bytes > 0) {
if (PrintGCDetails && Verbose) {
-@@ -6094,7 +6094,7 @@
+@@ -6095,7 +6095,7 @@
HeapWord* curAddr = _markBitMap.startWord();
while (curAddr < _markBitMap.endWord()) {
size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr);
@@ -19,7 +19,7 @@ diff -Nru openjdk.orig/hotspot/src/share
_markBitMap.clear_large_range(chunk);
if (ConcurrentMarkSweepThread::should_yield() &&
!foregroundGCIsActive() &&
-@@ -6382,7 +6382,7 @@
+@@ -6383,7 +6383,7 @@
return;
}
// Double capacity if possible
@@ -29,8 +29,8 @@ diff -Nru openjdk.orig/hotspot/src/share
// get the double capacity that we desired.
ReservedSpace rs(ReservedSpace::allocation_align_size_up(
diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2009-10-20 22:57:45.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2009-10-20 22:59:56.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2010-01-11 20:48:22.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2010-01-11 20:57:36.000000000 +0000
@@ -412,7 +412,7 @@
_regionStack(),
// _finger set in set_non_marking_state
@@ -67,7 +67,7 @@ diff -Nru openjdk.orig/hotspot/src/share
for (int i = 0; i < size; i++) delete _par_cleanup_thread_state[i];
FREE_C_HEAP_ARRAY(ParCleanupThreadState*,
_par_cleanup_thread_state);
-@@ -1761,7 +1761,7 @@
+@@ -1708,7 +1708,7 @@
if (has_aborted()) return;
int first = 0;
@@ -76,7 +76,7 @@ diff -Nru openjdk.orig/hotspot/src/share
for (int t = 0; t < last; t++) {
UncleanRegionList* list = &_par_cleanup_thread_state[t]->list;
assert(list->well_formed(), "Inv");
-@@ -3197,7 +3197,7 @@
+@@ -3202,7 +3202,7 @@
// of things to do) or totally (at the very end).
size_t target_size;
if (partially)
@@ -86,8 +86,8 @@ diff -Nru openjdk.orig/hotspot/src/share
target_size = 0;
diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2009-10-20 23:01:31.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2010-01-11 20:57:36.000000000 +0000
@@ -1058,7 +1058,7 @@
// This can be done by either mutator threads together with the
// concurrent refinement threads or GC threads.
@@ -98,8 +98,8 @@ diff -Nru openjdk.orig/hotspot/src/share
HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2009-10-20 22:59:56.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2010-01-11 20:57:36.000000000 +0000
@@ -863,8 +863,8 @@
void PSParallelCompact::initialize_dead_wood_limiter()
{
@@ -112,8 +112,8 @@ diff -Nru openjdk.orig/hotspot/src/share
DEBUG_ONLY(_dwl_initialized = true;)
_dwl_adjustment = normal_distribution(1.0);
diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2009-10-20 22:59:56.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2010-01-11 20:57:36.000000000 +0000
@@ -63,7 +63,7 @@
_last_used = current_live;
@@ -124,8 +124,8 @@ diff -Nru openjdk.orig/hotspot/src/share
// Compute the desired size:
diff -Nru openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
---- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2009-10-20 22:59:56.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2010-01-11 20:57:36.000000000 +0000
@@ -281,7 +281,7 @@
// yield a size that is too small) and bound it by MaxNewSize above.
// Ergonomics plays here by previously calculating the desired
@@ -198,8 +198,8 @@ diff -Nru openjdk.orig/hotspot/src/share
} else {
diff -Nru openjdk.orig/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
---- openjdk.orig/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2009-10-20 22:59:56.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2010-01-11 20:57:36.000000000 +0000
@@ -221,7 +221,7 @@
size_t init_sz;
@@ -210,9 +210,9 @@ diff -Nru openjdk.orig/hotspot/src/share
// Startup issue - main thread initialized before heap initialized.
init_sz = min_size();
diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2009-10-20 22:57:44.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-10-20 23:02:17.000000000 +0100
-@@ -1064,7 +1064,7 @@
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2010-01-11 20:48:21.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2010-01-11 20:59:44.000000000 +0000
+@@ -1071,7 +1071,7 @@
// NewSize was set on the command line and it is larger than
// preferred_max_new_size.
if (!FLAG_IS_DEFAULT(NewSize)) { // NewSize explicitly set at command-line
@@ -221,7 +221,7 @@ diff -Nru openjdk.orig/hotspot/src/share
} else {
FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
}
-@@ -1083,7 +1083,7 @@
+@@ -1090,7 +1090,7 @@
// there was no obvious reason. Also limit to the case where
// MaxNewSize has not been set.
@@ -230,23 +230,23 @@ diff -Nru openjdk.orig/hotspot/src/share
// Code along this path potentially sets NewSize and OldSize
-@@ -1125,8 +1125,8 @@
+@@ -1132,8 +1132,8 @@
// Unless explicitly requested otherwise, make young gen
// at least min_new, and at most preferred_max_new_size.
if (FLAG_IS_DEFAULT(NewSize)) {
- FLAG_SET_ERGO(uintx, NewSize, MAX2(NewSize, min_new));
- FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, NewSize));
-+ FLAG_SET_ERGO(uintx, NewSize, MAX2((size_t) NewSize, min_new));
++ FLAG_SET_ERGO(uintx, NewSize, MAX2((size_t) NewSize, min_new));
+ FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, (size_t) NewSize));
- if(PrintGCDetails && Verbose) {
+ if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
tty->print_cr("Ergo set NewSize: " SIZE_FORMAT, NewSize);
-@@ -1137,7 +1137,7 @@
+@@ -1144,7 +1144,7 @@
// later NewRatio will decide how it grows; see above.
if (FLAG_IS_DEFAULT(OldSize)) {
if (max_heap > NewSize) {
-- FLAG_SET_ERGO(uintx, OldSize, MIN2(3*NewSize, max_heap - NewSize));
-+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t) (3*NewSize), max_heap - (size_t) NewSize));
- if(PrintGCDetails && Verbose) {
+- FLAG_SET_ERGO(uintx, OldSize, MIN2(3*NewSize, max_heap - NewSize));
++ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t) 3*NewSize, max_heap - (size_t) NewSize));
+ if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
tty->print_cr("Ergo set OldSize: " SIZE_FORMAT, OldSize);
diff -r 8577904b8e6f -r a578b17f5853 patches/hotspot/hs16/memory-limits.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs16/memory-limits.patch Wed Jan 13 21:14:16 2010 +0000
@@ -0,0 +1,24 @@
+diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2010-01-11 20:44:32.000000000 +0000
+@@ -95,7 +95,7 @@
+
+ // Heap related flags
+ define_pd_global(uintx,PermSize, ScaleForWordSize(16*M));
+-define_pd_global(uintx,MaxPermSize, ScaleForWordSize(64*M));
++define_pd_global(uintx,MaxPermSize, ScaleForWordSize(128*M));
+
+ // Ergonomics related flags
+ define_pd_global(bool, NeverActAsServerClassMachine, false);
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp openjdk/hotspot/src/share/vm/runtime/globals.hpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2010-01-11 20:45:17.000000000 +0000
+@@ -2809,7 +2809,7 @@
+ product(uintx, InitialHeapSize, 0, \
+ "Initial heap size (in bytes); zero means OldSize + NewSize") \
+ \
+- product(uintx, MaxHeapSize, ScaleForWordSize(96*M), \
++ product(uintx, MaxHeapSize, ScaleForWordSize(512*M), \
+ "Maximum heap size (in bytes)") \
+ \
+ product(uintx, OldSize, ScaleForWordSize(4*M), \
diff -r 8577904b8e6f -r a578b17f5853 patches/hotspot/hs16/shark.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs16/shark.patch Wed Jan 13 21:14:16 2010 +0000
@@ -0,0 +1,9 @@
+--- openjdk.orig/hotspot/src/cpu//zero/vm/shark_globals_zero.hpp 2009-09-10 15:36:58.658607552 +0100
++++ openjdk/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp 2010-01-13 14:57:16.000000000 +0000
+@@ -59,5 +59,5 @@
+ define_pd_global(uintx, PermSize, 12*M );
+ define_pd_global(uintx, MaxPermSize, 64*M );
+ define_pd_global(bool, NeverActAsServerClassMachine, true );
+-define_pd_global(uintx, DefaultMaxRAM, 1*G );
++define_pd_global(uint64_t,MaxRAM, 1ULL*G);
+ define_pd_global(bool, CICompileOSR, true );
diff -r 8577904b8e6f -r a578b17f5853 patches/hotspot/original/memory-limits.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/memory-limits.patch Wed Jan 13 21:14:16 2010 +0000
@@ -0,0 +1,23 @@
+diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2008-05-23 22:30:44.000000000 +0100
++++ openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2008-05-23 22:30:59.000000000 +0100
+@@ -98,7 +98,7 @@
+
+ // Heap related flags
+ define_pd_global(uintx, PermSize, ScaleForWordSize(16*M));
+-define_pd_global(uintx, MaxPermSize, ScaleForWordSize(64*M));
++define_pd_global(uintx, MaxPermSize, ScaleForWordSize(128*M));
+
+ // Ergonomics related flags
+ define_pd_global(bool, NeverActAsServerClassMachine, false);
+--- penjdk6/hotspot/src/share/vm/runtime/globals.hpp 2008-02-12 04:14:24.000000000 -0500
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2008-02-14 16:34:00.000000000 -0500
+@@ -2606,7 +2606,7 @@
+ "an OS lock") \
+ \
+ /* gc parameters */ \
+- product(uintx, MaxHeapSize, ScaleForWordSize(64*M), \
++ product(uintx, MaxHeapSize, ScaleForWordSize(512*M), \
+ "Default maximum size for object heap (in bytes)") \
+ \
+ product_pd(uintx, NewSize, \
diff -r 8577904b8e6f -r a578b17f5853 patches/icedtea-memory-limits.patch
--- a/patches/icedtea-memory-limits.patch Mon Jan 11 20:12:43 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
---- openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2008-05-23 22:30:44.000000000 +0100
-+++ openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2008-05-23 22:30:59.000000000 +0100
-@@ -98,7 +98,7 @@
-
- // Heap related flags
- define_pd_global(uintx, PermSize, ScaleForWordSize(16*M));
--define_pd_global(uintx, MaxPermSize, ScaleForWordSize(64*M));
-+define_pd_global(uintx, MaxPermSize, ScaleForWordSize(128*M));
-
- // Ergonomics related flags
- define_pd_global(bool, NeverActAsServerClassMachine, false);
---- penjdk6/hotspot/src/share/vm/runtime/globals.hpp 2008-02-12 04:14:24.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2008-02-14 16:34:00.000000000 -0500
-@@ -2606,7 +2606,7 @@
- "an OS lock") \
- \
- /* gc parameters */ \
-- product(uintx, MaxHeapSize, ScaleForWordSize(64*M), \
-+ product(uintx, MaxHeapSize, ScaleForWordSize(512*M), \
- "Default maximum size for object heap (in bytes)") \
- \
- product_pd(uintx, NewSize, \
More information about the distro-pkg-dev
mailing list