--- a/ChangeLog	Fri Jun 24 17:41:56 2011 +0200
+++ b/ChangeLog	Mon Jun 27 16:21:50 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-24  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* Makefile.am: added new patch

--- a/Makefile.am	Fri Jun 24 17:41:56 2011 +0200
+++ b/Makefile.am	Mon Jun 27 16:21:50 2011 +0200
@@ -11,8 +11,8 @@
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
-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
@@ -399,11 +399,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
@@ -1856,9 +1851,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 $@

--- a/NEWS	Fri Jun 24 17:41:56 2011 +0200
+++ b/NEWS	Mon Jun 27 16:21:50 2011 +0200
@@ -54,12 +54,25 @@
   - CA156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21.
   - CA157: ARM SMP Assertion thinlock failed.
 * 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.
   - Rework OpenJDK storage of native thread structure.
   - Implement remaining OpenJDK Array reflection interface.
-  - Ignore all unknown options.
   - Handle overflow in getPhysicalMemory().
   - Base default min and max heap size on physical memory.
   - Fix reflective array access.

--- a/patches/jamvm/ignore-unknown-options.patch	Fri Jun 24 17:41:56 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 */
-         }
-     }
-