Mercurial > hg > release > icedtea7-2.0

changeset 2447:61e88e07618c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
JamVM: Update to 2011-06-13 revision. 2011-06-27 Xerxes R?nby <xerxes@zafena.se> JamVM - Make classlib init functions consistent + warnings. - Correctly implement sun.misc.Unsafe freeMemory(). - Move lazy-loading to init function. - Fix various warnings with -Wall. - PrintThreadsDump needs "self" as argument. - CopyMemory, etc. handle negative or truncation in length. - Extra sun.misc.Unsafe functions. - Ignore options for jtreg tests. - Enable shutdownVM to be called with OpenJDK classlib. - Initial implementation of JVM_FindClassFromBootLoader. - Fix callJNIMethod on i386 with -fomit-frame-pointer. - Fix backwards cache conflict resolution code. - Unify command line options parsing. - Remove debug printf. * NEWS: Updated. * Makefile.am (ICEDTEA_PATCHES): Remove upstreamed JamVM patch. (JAMVM_VERSION): Updated JamVM to 2011-06-13 revision. (JAMVM_SHA256SUM): Updated. (stamps/jamvm.stamp): Add -f when creating client symlink to handle repeat builds. Link the fake libjsig.so to JamVM libjvm.so to work with latest OpenJDK ALT_HOTSPOT_IMPORT_PATH functionality. * patches/jamvm/ignore-unknown-options.patch: Removed. Replaced by upstream, unify command line options parsing, changeset 1b248439e88ae6cbd1471addc49e2666b8964ced.
author Xerxes R?nby <xerxes@zafena.se>
date Mon, 27 Jun 2011 16:51:58 +0200
parents 2e7eaebf5cc9
children 4388af44fea7
files ChangeLog Makefile.am NEWS patches/jamvm/ignore-unknown-options.patch
diffstat 4 files changed, 48 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 27 16:43:49 2011 +0200
+++ b/ChangeLog	Mon Jun 27 16:51:58 2011 +0200
@@ -1,3 +1,33 @@
+2011-06-27  Xerxes Rånby  <xerxes@zafena.se>
+
+	JamVM
+	- Make classlib init functions consistent + warnings.
+	- Correctly implement sun.misc.Unsafe freeMemory().
+	- Move lazy-loading to init function.
+	- Fix various warnings with -Wall.
+	- PrintThreadsDump needs "self" as argument.
+	- CopyMemory, etc. handle negative or truncation in length.
+	- Extra sun.misc.Unsafe functions.
+	- Ignore options for jtreg tests.
+	- Enable shutdownVM to be called with OpenJDK classlib.
+	- Initial implementation of JVM_FindClassFromBootLoader.
+	- Fix callJNIMethod on i386 with -fomit-frame-pointer.
+	- Fix backwards cache conflict resolution code.
+	- Unify command line options parsing.
+	- Remove debug printf.
+	* NEWS: Updated.
+	* Makefile.am
+	(ICEDTEA_PATCHES): Remove upstreamed JamVM patch.
+	(JAMVM_VERSION): Updated JamVM to 2011-06-13 revision.
+	(JAMVM_SHA256SUM): Updated.
+	(stamps/jamvm.stamp):
+	Add -f when creating client symlink to handle repeat builds.
+	Link the fake libjsig.so to JamVM libjvm.so to work
+	with latest OpenJDK ALT_HOTSPOT_IMPORT_PATH functionality.
+	* patches/jamvm/ignore-unknown-options.patch: Removed.
+	Replaced by upstream, unify command line options parsing,
+	changeset 1b248439e88ae6cbd1471addc49e2666b8964ced.
+
 2011-06-27  Xerxes Rånby  <xerxes@zafena.se>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Jun 27 16:43:49 2011 +0200
+++ b/Makefile.am	Mon Jun 27 16:51:58 2011 +0200
@@ -24,8 +24,8 @@
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
 
-JAMVM_VERSION = 2e52a601883dda84c824b43363c02881def3e06d
-JAMVM_SHA256SUM = b26bc67ddfb50c98761aa4939254470ec9a8f88e9a22628b858603099a784af8
+JAMVM_VERSION = f8b8e8e78ec057a5852ff8c0f3386b48f3eca907
+JAMVM_SHA256SUM = 4107152b0a840656f3551c9b21cb52696417ba6d597457a8b34c86437f9ce64e
 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
@@ -306,11 +306,6 @@
 	patches/cacao/ignore-tests.patch
 endif
 
-if BUILD_JAMVM
-ICEDTEA_PATCHES += \
-	patches/jamvm/ignore-unknown-options.patch
-endif
-
 if ENABLE_PULSE_JAVA
 ICEDTEA_PATCHES += \
 	patches/pulse-soundproperties.patch
@@ -2085,9 +2080,9 @@
 	$(MAKE) install
 	mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
 	cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
-	ln -s server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
+	ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
 	touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
-	touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
+	ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
 endif
 	mkdir -p stamps
 	touch stamps/jamvm.stamp
--- a/NEWS	Mon Jun 27 16:43:49 2011 +0200
+++ b/NEWS	Mon Jun 27 16:51:58 2011 +0200
@@ -12,6 +12,20 @@
 New in release 2.0 (2011-XX-XX):
 
 * JamVM
+  - Make classlib init functions consistent + warnings.
+  - Correctly implement sun.misc.Unsafe freeMemory().
+  - Move lazy-loading to init function.
+  - Fix various warnings with -Wall.
+  - PrintThreadsDump needs "self" as argument.
+  - CopyMemory, etc. handle negative or truncation in length.
+  - Extra sun.misc.Unsafe functions.
+  - Ignore options for jtreg tests.
+  - Enable shutdownVM to be called with OpenJDK classlib.
+  - Initial implementation of JVM_FindClassFromBootLoader.
+  - Fix callJNIMethod on i386 with -fomit-frame-pointer.
+  - Fix backwards cache conflict resolution code.
+  - Unify command line options parsing.
+  - Remove debug printf.
   - Fix leak of native thread structure.
   - Consistent naming for classlib functions.
   - Add extra includes to get rid off compiler warning.
--- a/patches/jamvm/ignore-unknown-options.patch	Mon Jun 27 16:43:49 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Index: jamvm/jamvm/src/jni.c
-===================================================================
---- jamvm.orig/jamvm/src/jni.c	2011-02-27 04:35:37.000000000 +0100
-+++ jamvm/jamvm/src/jni.c	2011-03-03 13:48:31.897900208 +0100
-@@ -1642,7 +1642,7 @@
-             /* Ignore */
-         } else if(!vm_args->ignoreUnrecognized) {
-             optError(args, "Unrecognised option: %s\n", string);
--            goto error;
-+            /* Ignore */
-         }
-     }
-