Mercurial > hg > icedtea8
changeset 1983:0373c927e1e9
Bump to b71 and disable the intree EC provider.
2009-09-11 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Bump to b71. Turn on DISABLE_INTREE_EC to
prevent the intree EC provider being built.
* patches/hotspot/default/icedtea-params-cast-size_t.patch:
Regenerated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 11 Sep 2009 14:09:28 +0100 |
| parents | d719734879cc |
| children | 755ac518cabd |
| files | ChangeLog Makefile.am patches/hotspot/default/icedtea-params-cast-size_t.patch |
| diffstat | 3 files changed, 56 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 27 17:40:22 2009 +0200 +++ b/ChangeLog Fri Sep 11 14:09:28 2009 +0100 @@ -1,3 +1,11 @@ +2009-09-11 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + Bump to b71. Turn on DISABLE_INTREE_EC to + prevent the intree EC provider being built. + * patches/hotspot/default/icedtea-params-cast-size_t.patch: + Regenerated. + 2009-08-27 Matthias Klose <doko@ubuntu.com> * acinclude.m4, configure.ac (FIND_PULSEAUDIO): Remove.
--- a/Makefile.am Thu Aug 27 17:40:22 2009 +0200 +++ b/Makefile.am Fri Sep 11 14:09:28 2009 +0100 @@ -1,20 +1,20 @@ -OPENJDK_VERSION = b70 +OPENJDK_VERSION = b71 -OPENJDK_CHANGESET = 1bbbd5c42f3a -CORBA_CHANGESET = 309d97756352 -JAXP_CHANGESET = df9569f46ae8 -JAXWS_CHANGESET = c33dece1b2b3 -JDK_CHANGESET = 1b0f308e49c3 -LANGTOOLS_CHANGESET = 742987f2c0d2 -HOTSPOT_CHANGESET = 468ea732650d +OPENJDK_CHANGESET = 47425552fc70 +CORBA_CHANGESET = 109171aadcfa +JAXP_CHANGESET = 6d4f2360ffe6 +JAXWS_CHANGESET = 75cfe6f615df +JDK_CHANGESET = 2a1a7fb44226 +LANGTOOLS_CHANGESET = 70cd643d6217 +HOTSPOT_CHANGESET = 73abf11e8e61 -OPENJDK_MD5SUM = 84dabfc7b592490dcd4b2a232bde44ef -CORBA_MD5SUM = ec0de438056ee14c48deb510c0d583dc -JAXP_MD5SUM = 732708e633ffef87fb4095ecbbf4add0 -JAXWS_MD5SUM = 492e61bf7f96d3832b3246c01c716aa8 -JDK_MD5SUM = f286fbed4ffb4bb5d368e8cab11b50fd -LANGTOOLS_MD5SUM = a0a13535ef6eec2292daa14f4cfe849d -HOTSPOT_MD5SUM = 9e2a49be9371abe80c6fb1bd4ad3de3e +OPENJDK_MD5SUM = d0753b769317c497ae14d9ab089504f7 +CORBA_MD5SUM = 5cb4f5afbef00fd662c554b9dd7312a7 +JAXP_MD5SUM = 0203983e81a05e548f7fc7bed557bf2c +JAXWS_MD5SUM = 07015564ab925a96cebf363814707d64 +JDK_MD5SUM = 9297009647ee6d3711fb59c3d3914404 +LANGTOOLS_MD5SUM = 70c0690c8ee523beb2a19dd1b7d2a9f9 +HOTSPOT_MD5SUM = 27eabf6067ac04edf002fad94671bbe1 CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa @@ -1582,7 +1582,8 @@ ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \ DEBUG_CLASSFILES="true" \ - DEBUG_BINARIES="true" + DEBUG_BINARIES="true" \ + DISABLE_INTREE_EC="true" if WITH_CACAO ICEDTEA_ENV += \ @@ -1670,7 +1671,8 @@ ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \ DEBUG_CLASSFILES="true" \ - DEBUG_BINARIES="true" + DEBUG_BINARIES="true" \ + DISABLE_INTREE_EC="true" if WITH_CACAO ICEDTEA_ENV_ECJ += \
--- a/patches/hotspot/default/icedtea-params-cast-size_t.patch Thu Aug 27 17:40:22 2009 +0200 +++ b/patches/hotspot/default/icedtea-params-cast-size_t.patch Fri Sep 11 14:09:28 2009 +0100 @@ -1,7 +1,7 @@ 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 2008-09-01 01:47:18.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2008-09-01 01:53:31.000000000 +0100 -@@ -938,7 +938,7 @@ +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2009-06-30 14:25:09.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2009-09-04 18:12:23.000000000 +0100 +@@ -940,7 +940,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 @@ } if (expand_bytes > 0) { if (PrintGCDetails && Verbose) { -@@ -6044,7 +6044,7 @@ +@@ -6063,7 +6063,7 @@ HeapWord* curAddr = _markBitMap.startWord(); while (curAddr < _markBitMap.endWord()) { size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr); @@ -19,7 +19,7 @@ _markBitMap.clear_large_range(chunk); if (ConcurrentMarkSweepThread::should_yield() && !foregroundGCIsActive() && -@@ -6332,7 +6332,7 @@ +@@ -6351,7 +6351,7 @@ return; } // Double capacity if possible @@ -29,9 +29,9 @@ // get the double capacity that we desired. ReservedSpace rs(ReservedSpace::allocation_align_size_up( 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 2008-08-14 08:40:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2008-09-01 01:49:59.000000000 +0100 -@@ -904,8 +904,8 @@ +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2009-05-08 17:40:27.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2009-09-04 18:12:23.000000000 +0100 +@@ -863,8 +863,8 @@ void PSParallelCompact::initialize_dead_wood_limiter() { const size_t max = 100; @@ -43,8 +43,8 @@ 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 2008-08-14 08:40:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2008-09-01 01:52:42.000000000 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2009-03-30 17:15:27.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2009-09-04 18:12:23.000000000 +0100 @@ -63,7 +63,7 @@ _last_used = current_live; @@ -55,9 +55,9 @@ // 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 2008-08-14 08:40:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2008-09-01 02:58:03.000000000 +0100 -@@ -287,7 +287,7 @@ +--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2009-03-30 17:15:27.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2009-09-04 18:12:23.000000000 +0100 +@@ -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 // NewSize and MaxNewSize. @@ -67,9 +67,9 @@ assert(max_new_size > 0, "All paths should set max_new_size"); 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 2008-08-14 08:40:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2008-09-01 01:49:59.000000000 +0100 -@@ -222,7 +222,7 @@ +--- openjdk.orig/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2009-03-30 17:15:27.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2009-09-04 18:12:23.000000000 +0100 +@@ -221,7 +221,7 @@ size_t init_sz; if (TLABSize > 0) { @@ -79,27 +79,27 @@ // 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 2008-09-01 01:47:17.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2008-09-01 01:58:01.000000000 +0100 -@@ -1025,7 +1025,7 @@ - // for "short" pauses ~ 4M*ParallelGCThreads - if (FLAG_IS_DEFAULT(MaxNewSize)) { // MaxNewSize not set at command-line +--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2009-09-04 16:27:02.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-09-04 18:13:00.000000000 +0100 +@@ -1064,7 +1064,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 - FLAG_SET_ERGO(uintx, MaxNewSize, MAX2(NewSize, preferred_max_new_size)); + FLAG_SET_ERGO(uintx, MaxNewSize, MAX2((size_t) NewSize, preferred_max_new_size)); } else { FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size); } -@@ -1038,7 +1038,7 @@ - // Old to Young gen size so as to shift the collection load - // to the old generation concurrent collector - if (FLAG_IS_DEFAULT(NewRatio)) { +@@ -1083,7 +1083,7 @@ + // there was no obvious reason. Also limit to the case where + // MaxNewSize has not been set. + - FLAG_SET_ERGO(intx, NewRatio, MAX2(NewRatio, new_ratio)); + FLAG_SET_ERGO(intx, NewRatio, MAX2((intx) NewRatio, new_ratio)); - size_t min_new = align_size_up(ScaleForWordSize(min_new_default), os::vm_page_size()); - size_t prev_initial_size = initial_heap_size(); -@@ -1067,8 +1067,8 @@ + // Code along this path potentially sets NewSize and OldSize + +@@ -1125,8 +1125,8 @@ // Unless explicitly requested otherwise, make young gen // at least min_new, and at most preferred_max_new_size. if (FLAG_IS_DEFAULT(NewSize)) { @@ -110,7 +110,7 @@ if(PrintGCDetails && Verbose) { // Too early to use gclog_or_tty tty->print_cr("Ergo set NewSize: " SIZE_FORMAT, NewSize); -@@ -1079,7 +1079,7 @@ +@@ -1137,7 +1137,7 @@ // later NewRatio will decide how it grows; see above. if (FLAG_IS_DEFAULT(OldSize)) { if (max_heap > NewSize) {