Mercurial > hg > release > icedtea7-2.1
changeset 2499:956bad867ba0
Merge
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Wed, 19 Oct 2011 06:35:01 +0100 |
parents | 78b0126c1595 (current diff) c3dc3e02a277 (diff) |
children | fb206d077513 |
files | ChangeLog Makefile.am NEWS patches/jamvm/gb-memory-fix.patch patches/jamvm/ignore-assertions-and-verify-options.patch |
diffstat | 5 files changed, 27 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 19 06:33:03 2011 +0100 +++ b/ChangeLog Wed Oct 19 06:35:01 2011 +0100 @@ -1,3 +1,23 @@ +2011-10-10 Xerxes RĂ„nby <xerxes@zafena.se> + + JamVM + - Implement classlibCheckIfOnLoad(). + - Make thread states JVMTI compatible. + - Add OpenBSD/sparc to list of recognised hosts. + - Handle 'g' when specifying memory + extra checks. + - Make command line compatibility options table-driven. + * NEWS: Updated. + * patches/jamvm/gb-memory-fix.patch: Replaced by upstream, + Handle 'g' when specifying memory + extra checks, + changeset 5b66309e20cfd9fe1119e0c9231060a9a583d846. + * patches/jamvm/ignore-assertions-and-verify-options.patch: + Replaced by upstream, Make command line compatibility options + table-driven, changeset d689b6527e26ef1098583ba39725d6e675f8b649. + * Makefile.am + (ICEDTEA_PATCHES): Remove upstreamed JamVM patches. + (JAMVM_VERSION): Updated JamVM to 2011-10-07 revision. + (JAMVM_SHA256SUM): Updated. + 2011-10-19 Andrew John Hughes <ahughes@redhat.com> * NEWS: Set release date of 2.0 and
--- a/Makefile.am Wed Oct 19 06:33:03 2011 +0100 +++ b/Makefile.am Wed Oct 19 06:35:01 2011 +0100 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 310c491ddc14e92a6ffff27030a1a1821e6395a8 -JAMVM_SHA256SUM = b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a +JAMVM_VERSION = 4617da717ecb05654ea5bb9572338061106a414d +JAMVM_SHA256SUM = 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz @@ -257,9 +257,7 @@ if BUILD_JAMVM ICEDTEA_PATCHES += \ - patches/jamvm/remove-sun.misc.Perf-debug-code.patch \ - patches/jamvm/gb-memory-fix.patch \ - patches/jamvm/ignore-assertions-and-verify-options.patch + patches/jamvm/remove-sun.misc.Perf-debug-code.patch endif if ENABLE_PULSE_JAVA
--- a/NEWS Wed Oct 19 06:33:03 2011 +0100 +++ b/NEWS Wed Oct 19 06:35:01 2011 +0100 @@ -62,7 +62,10 @@ - Add support for armhf. - Skip Java-reflection-related DelegatingClassLoaders, enables JamVM to run NetBeans. - Generic JNI stubs for common JNI method signatures. - - Fix memory heap arguments in terms of gigabytes. + - Implement classlibCheckIfOnLoad(). + - Make thread states JVMTI compatible. + - Add OpenBSD/sparc to list of recognised hosts. + - Handle 'g' when specifying memory + extra checks. - armhf: ensure stack is 8 byte aligned. - "Fix" handling of CLI bootclasspath options. - Fix for StackTraceElement checkin.
--- a/patches/jamvm/gb-memory-fix.patch Wed Oct 19 06:33:03 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -diff -Nru jamvm/jamvm/src/init.c jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa/src/init.c ---- jamvm.orig/jamvm/src/init.c 2011-03-25 17:36:12.000000000 +0800 -+++ jamvm/jamvm/src/init.c 2011-09-26 16:54:08.000000000 +0800 -@@ -123,6 +123,11 @@ - case '\0': - break; - -+ case 'G': -+ case 'g': -+ n *= GB; -+ break; -+ - case 'M': - case 'm': - n *= MB; -diff -Nru jamvm/jamvm/src/jam.h jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa/src/jam.h ---- jamvm.orig/jamvm/src/jam.h 2011-03-25 17:36:12.000000000 +0800 -+++ jamvm/jamvm/src/jam.h 2011-09-26 16:51:56.000000000 +0800 -@@ -734,6 +734,7 @@ - - #define KB 1024 - #define MB (KB*KB) -+#define GB (MB*KB) - - /* minimum allowable size of object heap */ - #define MIN_HEAP 4*KB
--- a/patches/jamvm/ignore-assertions-and-verify-options.patch Wed Oct 19 06:33:03 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -Index: jamvm/jamvm/src/init.c -=================================================================== ---- jamvm.orig/jamvm/src/init.c 2011-08-12 14:12:00.775411188 +0200 -+++ jamvm/jamvm/src/init.c 2011-08-12 16:22:24.110205028 +0200 -@@ -272,6 +272,15 @@ - /* Compatibility options */ - } else if(strcmp(string, "-Xcomp") == 0 || - strcmp(string, "-Xbatch") == 0 || -+ strcmp(string, "-ea") == 0 || -+ strcmp(string, "-da") == 0 || -+ strcmp(string, "-dsa") == 0 || -+ strcmp(string, "-esa") == 0 || -+ strncmp(string, "-ea:", 4) == 0 || -+ strncmp(string, "-da:", 4) == 0 || -+ strncmp(string, "-dsa:", 5) == 0 || -+ strncmp(string, "-esa:", 5) == 0 || -+ strncmp(string, "-Xverify:", 9) == 0 || - strncmp(string, "-XX:", 4) == 0) { - /* Ignore */ - } else