--- a/ChangeLog	Sun Mar 13 01:00:55 2011 +0100
+++ b/ChangeLog	Fri May 20 00:19:55 2011 +0100
@@ -1,3 +1,19 @@
+2011-03-17  Xerxes Ranby  <xerxes@zafena.se>
+
+	JamVM: Update to latest JamVM revision and remove upstreamed pathes.
+	Update contains the following new JamVM improvements:
+	Handle O_DELETE in JVM_Open
+	Minor performance improvement on ARM
+	First set of changes to support JamVM/OpenJDK on MacOS X
+	Minor memory leak (missing free)
+	Handle integer overflow on i386/amd64
+	* NEWS: Updated.
+	* Makefile.am: Remove upstreamed JamVM patches.
+	(JAMVM_VERSION): Updated to latest JamVM revision.
+	(JAMVM_SHA256SUM): Updated.
+	* patches/jamvm/arm-interp_cflags-marm.patch: Deleted.
+	* patches/jamvm/mips64el.patch: Deleted.
+
 2011-03-13  Xerxes Ranby  <xerxes@zafena.se>
 	    Robert Loughter  <rob@jamvm.org.uk>
 

--- a/Makefile.am	Sun Mar 13 01:00:55 2011 +0100
+++ b/Makefile.am	Fri May 20 00:19:55 2011 +0100
@@ -24,8 +24,8 @@
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
 
-JAMVM_VERSION = 9acc3f22f885340bef0acabb568eaeabe4450bfb
-JAMVM_SHA256SUM = ab8bd9e37d7eea26c3ec2e5e86ac4d782327416bcef1be9deb9453e11b145e83
+JAMVM_VERSION = 78f044e3052e804d4dcc37014dc52e78266d5875
+JAMVM_SHA256SUM = d11b8966e616210c2e718d80f9c12be2a8fbed92d12bb2a8b9b119ac99b69acc
 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
@@ -314,9 +314,7 @@
 
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
-	patches/jamvm/ignore-unknown-options.patch \
-	patches/jamvm/mips64el.patch \
-	patches/jamvm/arm-interp_cflags-marm.patch
+	patches/jamvm/ignore-unknown-options.patch
 endif
 
 if ENABLE_PULSE_JAVA

--- a/NEWS	Sun Mar 13 01:00:55 2011 +0100
+++ b/NEWS	Fri May 20 00:19:55 2011 +0100
@@ -6,7 +6,16 @@
 * Allow building of JamVM beside the default VM by using --with-additional-vms=jamvm
 * Allow the location of the JamVM source zip to be specified using --with-jamvm-src-zip
 * JamVM builds can bootstrap and are self-hosting.
-* Added JamVM support for mips and mips64.
+* JamVM
+  - Ignore all unknown options.
+  - Handle O_DELETE in JVM_Open.
+  - Minor performance improvement on ARM.
+  - First set of changes to support JamVM/OpenJDK on MacOS X.
+  - Minor memory leak (missing free).
+  - Handle integer overflow on i386/amd64.
+  - On ARM, force interpreter to be built in ARM mode.
+  - MIPS: 64-bit and interpreter inlining by default.
+  - Trivial implementation of stubs for MIPS.
 * Bug fixes
   - PR616, PR99: Don't statically link libstdc++
   - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.

--- a/patches/jamvm/arm-interp_cflags-marm.patch	Sun Mar 13 01:00:55 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Index: jamvm/jamvm/configure.ac
-===================================================================
---- jamvm.orig/jamvm/configure.ac	2011-03-11 15:15:57.000000000 +0100
-+++ jamvm/jamvm/configure.ac	2011-03-11 15:16:56.000000000 +0100
-@@ -43,7 +43,7 @@
- mips64el-*-linux*) host_cpu=mips host_os=linux ;;
- x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
- x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
--arm*-*-linux*) host_cpu=arm host_os=linux ;;
-+arm*-*-linux*) host_cpu=arm host_os=linux interp_cflags=-marm ;;
- arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
- arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
- powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
-@@ -178,7 +178,7 @@
- 
-         if test "$enable_int_inlining" != no; then
-             AC_DEFINE([INLINING],1,[interpreter inlining])
--            interp_cflags=-fno-reorder-blocks 
-+            interp_cflags="$interp_cflags -fno-reorder-blocks"
- 
-             if test "$enable_runtime_reloc_checks" != no; then
-                 AC_DEFINE([RUNTIME_RELOC_CHECKS],1,[compute relocatability at runtime])

--- a/patches/jamvm/mips64el.patch	Sun Mar 13 01:00:55 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-Index: jamvm/jamvm/configure.ac
-===================================================================
---- jamvm.orig/jamvm/configure.ac	2011-03-09 13:13:12.781424034 +0100
-+++ jamvm/jamvm/configure.ac	2011-03-09 13:13:47.752903998 +0100
-@@ -40,6 +40,7 @@
- x86_64-*-linux*) host_os=linux ;;
- hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
- mipsel-*-linux*) host_cpu=mips host_os=linux ;;
-+mips64el-*-linux*) host_cpu=mips host_os=linux ;;
- x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
- x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
- arm*-*-linux*) host_cpu=arm host_os=linux ;;