--- a/ChangeLog	Sat May 04 17:07:06 2013 +0100
+++ b/ChangeLog	Tue May 07 15:59:03 2013 +0200
@@ -1,3 +1,22 @@
+2013-05-07  Xerxes Rånby  <xerxes@zafena.se>
+
+	JamVM
+	- JSR 335: (lambda expressions) initial hack
+	- JEP 171: Implement fence methods in sun.misc.Unsafe
+	- Fix invokesuper check in invokespecial opcode
+	- Fix non-direct interpreter invokespecial super-class check
+	- When GC'ing a native method don't try to free code
+	- Do not free unprepared Miranda method code data
+	- Set anonymous class protection domain
+	- JVM_IsVMGeneratedMethodIx stub
+	- Dummy implementation of sun.misc.Perf natives
+	* NEWS: Updated.
+	* patches/jamvm/remove-sun.misc.Perf-debug-code.patch: Removed.
+	* Makefile.am
+	(JAMVM_VERSION): Updated JamVM to 2013-05-06 revision.
+	(JAMVM_SHA256SUM): Updated.
+	(ICEDTEA_PATCHES): Drop unneeded sun.misc.Perf patch. 
+
 2013-04-17  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* patches/boot/ecj-diamond.patch:

--- a/Makefile.am	Sat May 04 17:07:06 2013 +0100
+++ b/Makefile.am	Tue May 07 15:59:03 2013 +0200
@@ -24,8 +24,8 @@
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
-JAMVM_VERSION = 0972452d441544f7dd29c55d64f1ce3a5db90d82
-JAMVM_SHA256SUM = bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03
+JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3
+JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97
 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
@@ -279,11 +279,6 @@
 	patches/cacao/ignore-tests.patch
 endif
 
-if BUILD_JAMVM
-ICEDTEA_PATCHES += \
-	patches/jamvm/remove-sun.misc.Perf-debug-code.patch
-endif
-
 if ENABLE_PULSE_JAVA
 ICEDTEA_PATCHES += \
 	patches/pulse-soundproperties.patch

--- a/NEWS	Sat May 04 17:07:06 2013 +0100
+++ b/NEWS	Tue May 07 15:59:03 2013 +0200
@@ -715,6 +715,16 @@
   - Clang fix for the i386 backend
   - Fix rt-timing
   - Moved rt-timing.{c,h} to C++
+* JamVM
+  - JSR 335: (lambda expressions) initial hack
+  - JEP 171: Implement fence methods in sun.misc.Unsafe
+  - Fix invokesuper check in invokespecial opcode
+  - Fix non-direct interpreter invokespecial super-class check
+  - When GC'ing a native method don't try to free code
+  - Do not free unprepared Miranda method code data
+  - Set anonymous class protection domain
+  - JVM_IsVMGeneratedMethodIx stub
+  - Dummy implementation of sun.misc.Perf natives
   
 New in release 2.3.8 (2013-03-11):
 

--- a/patches/jamvm/remove-sun.misc.Perf-debug-code.patch	Sat May 04 17:07:06 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-Index: openjdk/jdk/src/share/classes/java/net/URLClassLoader.java
-===================================================================
---- openjdk.orig/jdk/src/share/classes/java/net/URLClassLoader.java	2011-06-13 16:58:42.000000000 +0200
-+++ openjdk/jdk/src/share/classes/java/net/URLClassLoader.java	2011-06-28 18:43:50.114802612 +0200
-@@ -438,14 +438,12 @@
-             // Use (direct) ByteBuffer:
-             CodeSigner[] signers = res.getCodeSigners();
-             CodeSource cs = new CodeSource(url, signers);
--            sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0);
-             return defineClass(name, bb, cs);
-         } else {
-             byte[] b = res.getBytes();
-             // must read certificates AFTER reading bytes.
-             CodeSigner[] signers = res.getCodeSigners();
-             CodeSource cs = new CodeSource(url, signers);
--            sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0);
-             return defineClass(name, b, 0, b.length, cs);
-         }
-     }
-Index: openjdk/jdk/src/share/classes/java/lang/ClassLoader.java
-===================================================================
---- openjdk.orig/jdk/src/share/classes/java/lang/ClassLoader.java	2011-06-13 16:58:42.000000000 +0200
-+++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java	2011-06-28 18:43:50.142802778 +0200
-@@ -422,10 +422,6 @@
-                     long t1 = System.nanoTime();
-                     c = findClass(name);
- 
--                    // this is the defining class loader; record the stats
--                    sun.misc.PerfCounter.getParentDelegationTime().addTime(t1 - t0);
--                    sun.misc.PerfCounter.getFindClassTime().addElapsedTimeFrom(t1);
--                    sun.misc.PerfCounter.getFindClasses().increment();
-                 }
-             }
-             if (resolve) {
-Index: openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java
-===================================================================
---- openjdk.orig/jdk/src/share/classes/java/util/zip/ZipFile.java	2011-06-28 18:56:56.994704556 +0200
-+++ openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java	2011-06-28 18:57:11.514776567 +0200
-@@ -212,8 +212,6 @@
-         this.zc = ZipCoder.get(charset);
-         long t0 = System.nanoTime();
-         jzfile = open(name, mode, file.lastModified(), usemmap);
--        sun.misc.PerfCounter.getZipFileOpenTime().addElapsedTimeFrom(t0);
--        sun.misc.PerfCounter.getZipFileCount().increment();
-         this.name = name;
-         this.total = getTotal(jzfile);
-     }