Mercurial > hg > release > icedtea6-1.12

changeset 2704:944802f79a48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 14 Oct 2011 00:30:10 +0100
parents 1bdef21bb6dd (current diff) 1ab1bf5f5db6 (diff)
children 642761211a7d
files ChangeLog Makefile.am patches/jamvm/gb-memory-fix.patch patches/jamvm/ignore-assertions-and-verify-options.patch
diffstat 5 files changed, 27 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Oct 14 00:28:47 2011 +0100
+++ b/ChangeLog	Fri Oct 14 00:30:10 2011 +0100
@@ -1,4 +1,24 @@
-2010-07-18  Andrew John Hughes  <ahughes@redhat.com>
+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.
+
+2010-10-05  Andrew John Hughes  <ahughes@redhat.com>
 
 	Move jtreg sources to top-level to avoid
 	conflict between ${srcdir}/test and
--- a/Makefile.am	Fri Oct 14 00:28:47 2011 +0100
+++ b/Makefile.am	Fri Oct 14 00:30:10 2011 +0100
@@ -11,8 +11,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
@@ -414,12 +414,6 @@
 	patches/cacao/ignore-tests.patch
 endif
 
-if BUILD_JAMVM
-ICEDTEA_PATCHES += \
-	patches/jamvm/gb-memory-fix.patch \
-	patches/jamvm/ignore-assertions-and-verify-options.patch
-endif
-
 if ENABLE_PULSE_JAVA
 ICEDTEA_PATCHES += \
 	patches/pulse-soundproperties.patch
--- a/NEWS	Fri Oct 14 00:28:47 2011 +0100
+++ b/NEWS	Fri Oct 14 00:30:10 2011 +0100
@@ -390,7 +390,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	Fri Oct 14 00:28:47 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	Fri Oct 14 00:28:47 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