Mercurial > hg > release > icedtea7-2.4
changeset 2628:d4e0f297cf8f
Upgrade to u40 b20.
2013-04-24 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am,
(OPENJDK_VERSION): Bump to b20.
(JDK_UPDATE_VERSION): Bump to 40.
(CORBA_CHANGESET): Update to IcedTea7 forest head.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* hotspot.map: Update to IcedTea7 forest head.
* patches/systemtap_gc.patch: Regenerated.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Wed, 24 Apr 2013 10:24:40 +0100 |
parents | 3757116b4861 |
children | e562523c5037 |
files | ChangeLog Makefile.am hotspot.map patches/systemtap_gc.patch |
diffstat | 4 files changed, 57 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 19 19:37:22 2013 +0100 +++ b/ChangeLog Wed Apr 24 10:24:40 2013 +0100 @@ -1,3 +1,23 @@ +2013-04-24 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am, + (OPENJDK_VERSION): Bump to b20. + (JDK_UPDATE_VERSION): Bump to 40. + (CORBA_CHANGESET): Update to IcedTea7 forest head. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * hotspot.map: Update to IcedTea7 forest head. + * patches/systemtap_gc.patch: Regenerated. + 2013-04-18 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1404: Failure to bootstrap with ecj 4.2
--- a/Makefile.am Fri Apr 19 19:37:22 2013 +0100 +++ b/Makefile.am Wed Apr 24 10:24:40 2013 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b17 -JDK_UPDATE_VERSION = 20 +OPENJDK_VERSION = b20 +JDK_UPDATE_VERSION = 40 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 04ad0a30f564 -JAXP_CHANGESET = e17ab897041e -JAXWS_CHANGESET = 7169780eff51 -JDK_CHANGESET = bc455fc9948f -LANGTOOLS_CHANGESET = 5f4ad2269018 -OPENJDK_CHANGESET = 8714dddd443a +CORBA_CHANGESET = 4366e0fe59d5 +JAXP_CHANGESET = 5a11895b645d +JAXWS_CHANGESET = 29619865cc64 +JDK_CHANGESET = d4cd8f10764d +LANGTOOLS_CHANGESET = 718a945bfdb9 +OPENJDK_CHANGESET = 6579f526e5e4 -CORBA_SHA256SUM = 625fd145c5e7bbd92f28321d2584d116279cb0bf07f417d0f463f57c78b90526 -JAXP_SHA256SUM = 698244f0a12cc7fa6c2994db7b0771ff7c4e00d6457aabb9c326778d0a078650 -JAXWS_SHA256SUM = cff9fb3f14aad77b6415418556805cbb23779d2b5fc6b7ebfd7bea5100b139fe -JDK_SHA256SUM = 54c3fff10484ce96b23599228ca99be89f4c433441da7489648c42fd8f03c0c8 -LANGTOOLS_SHA256SUM = 925f8166907dda64491dcaff51460ee83090d060f76abb4ff0efa7b9e1612a17 -OPENJDK_SHA256SUM = 7b500b6306981d0182a12e90b37182741df9931b34107a13686a77951ff7b0b3 +CORBA_SHA256SUM = b23b0980c704247a0a690f6fb663ec561f56e2fcdc5d69f13d9629d2c1937f32 +JAXP_SHA256SUM = a0f4516cdabb60bea73ce157db3c31c24634bc4058d35257b981b6b1be5114ba +JAXWS_SHA256SUM = 53e63c8b63380f4a34ae955f91455ece2f687dbe3dd47e4c14ac03761cb3daee +JDK_SHA256SUM = 4a03854b630151719fa9747525c08bc6b86362d7d2a26e62e349dc9ebfc27e51 +LANGTOOLS_SHA256SUM = c412b61b095154fee4c45dc133f2baca3100fecd48b742f80da49a52ec473b02 +OPENJDK_SHA256SUM = 44c3e4a130fe4b76c1ba977ae2251884cefa774b82a24c4415b64395aef9594c CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
--- a/hotspot.map Fri Apr 19 19:37:22 2013 +0100 +++ b/hotspot.map Wed Apr 24 10:24:40 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot b9bbe418db87 af823ea6283514495a42c291ed1d7d79c2ee86f8917e5f6f2782218a193546d9 +default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 2fc73bd48efa 1f4a059d6b25d05145a0f6313b24e36641a541dbf9ff33d6780143b1513a1946
--- a/patches/systemtap_gc.patch Fri Apr 19 19:37:22 2013 +0100 +++ b/patches/systemtap_gc.patch Wed Apr 24 10:24:40 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp openjdk/hotspot/src/share/vm/compiler/oopMap.cpp ---- openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp 2013-04-04 13:07:33.894232787 +0100 +--- openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp 2013-04-24 09:29:58.431723500 +0100 @@ -33,9 +33,13 @@ #include "memory/resourceArea.hpp" #include "runtime/frame.inline.hpp" @@ -26,8 +26,8 @@ // Delete entry delete entry; 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 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-04-04 13:07:33.902232915 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-04-24 09:29:58.439723629 +0100 @@ -59,6 +59,12 @@ #include "runtime/vmThread.hpp" #include "services/memoryService.hpp" @@ -56,8 +56,8 @@ void CMSCollector::collect(bool full, diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-04-04 13:07:33.910233043 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-04-24 09:29:58.439723629 +0100 @@ -50,8 +50,13 @@ #include "runtime/thread.hpp" #include "runtime/vmThread.hpp" @@ -93,8 +93,8 @@ // CHF: cheating for now!!! // Universe::set_heap_capacity_at_last_gc(Universe::heap()->capacity()); diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-04-04 13:07:33.922233234 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-04-24 09:29:58.443723700 +0100 @@ -43,8 +43,14 @@ #include "runtime/java.hpp" #include "runtime/vmThread.hpp" @@ -125,8 +125,8 @@ // This interface assumes that it's being called by the 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 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-04-04 13:07:33.930233362 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-04-24 09:29:58.447723769 +0100 @@ -58,11 +58,18 @@ #include "services/management.hpp" #include "services/memoryService.hpp" @@ -166,7 +166,7 @@ GCCause::Cause gc_cause = heap->gc_cause(); assert(!heap->is_gc_active(), "not reentrant"); -@@ -3396,6 +3409,9 @@ +@@ -3397,6 +3410,9 @@ // past the end of the partial object entering the region (if any). HeapWord* const dest_addr = sd.partial_obj_end(dp_region); HeapWord* const new_top = _space_info[space_id].new_top(); @@ -177,8 +177,8 @@ const size_t words = pointer_delta(new_top, dest_addr); diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-04-04 13:07:33.938233490 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-04-24 09:29:58.447723769 +0100 @@ -55,8 +55,17 @@ #include "runtime/vmThread.hpp" #include "runtime/vm_operations.hpp" @@ -234,8 +234,8 @@ } diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-04-04 13:07:33.954233746 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-04-24 09:29:58.451723832 +0100 @@ -54,6 +54,12 @@ #include "utilities/copy.hpp" #include "utilities/globalDefinitions.hpp" @@ -271,8 +271,8 @@ TASKQUEUE_STATS_ONLY(thread_state_set.print_termination_stats()); TASKQUEUE_STATS_ONLY(thread_state_set.print_taskqueue_stats()); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-04-04 13:09:36.164185907 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-04-24 09:30:36.336328227 +0100 @@ -42,6 +42,7 @@ #include "oops/oop.inline.hpp" #include "runtime/java.hpp" @@ -312,11 +312,11 @@ +#endif /* !USDT2 */ + gch->trace_heap_after_gc(&gc_tracer); + gc_tracer.report_tenuring_threshold(tenuring_threshold()); - _gc_timer->register_gc_end(os::elapsed_counter()); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/generation.cpp openjdk/hotspot/src/share/vm/memory/generation.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/generation.cpp 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2013-04-04 13:09:11.707795116 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/generation.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2013-04-24 09:29:58.459723953 +0100 @@ -41,8 +41,14 @@ #include "oops/oop.inline.hpp" #include "runtime/java.hpp" @@ -347,8 +347,8 @@ gc_timer->register_gc_end(os::elapsed_counter()); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-04-03 14:17:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-04-04 13:07:33.974234065 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-04-23 23:15:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-04-24 09:29:58.459723953 +0100 @@ -33,6 +33,12 @@ #include "memory/tenuredGeneration.hpp" #include "oops/oop.inline.hpp"