Mercurial > hg > release > icedtea7-2.5

changeset 2662:3baf4babcab2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 30 Aug 2013 14:23:03 +0100
parents 8a3e739706f8 (current diff) b5fa79fec364 (diff)
children d0908d45075a
files ChangeLog
diffstat 3 files changed, 28 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Aug 30 14:21:42 2013 +0100
+++ b/ChangeLog	Fri Aug 30 14:23:03 2013 +0100
@@ -4,6 +4,27 @@
 	(IT_BYTECODE7_CHECK): Remove inverse logic to
 	make things clearer.
 
+2013-08-14  Xerxes Rånby  <xerxes@zafena.se>
+	    Robert Lougher  <rob@jamvm.org.uk>
+
+	JamVM
+	- JSR 292: enable for OpenJDK 7/IcedTea 2
+	- JSR 335: invokeinterface check in method resolution
+	- JSR 335: java.lang.invoke.MagicLambdaImpl
+	- JSR 292: invokedynamic is 5 bytes - non-direct interp
+	- JSR 292: invokedynamic is 5 bytes in length
+	- Minor formatting change
+	- Minor fixes: use perror for mmap failure
+	- FreeClassData: fix comment
+	- FreeClassData: adjust method count for Miranda methods
+	- JSR 335: remove GC hack
+	- JSR 335: implement "bridge" methods for Mirandas
+	- JSR 335: handle multiple defaults and conflicts
+	* NEWS: Updated.
+	* Makefile.am
+	(JAMVM_VERSION): Updated JamVM to 2013-07-14 revision.
+	(JAMVM_SHA256SUM): Updated.
+
 2013-07-12  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* patches/boot/ecj-diamond.patch:
--- a/Makefile.am	Fri Aug 30 14:21:42 2013 +0100
+++ b/Makefile.am	Fri Aug 30 14:23:03 2013 +0100
@@ -24,8 +24,8 @@
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
-JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3
-JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97
+JAMVM_VERSION = 1a58072f8339270f9372c273d82a00790e04375d
+JAMVM_SHA256SUM = b6dafea4924a2772877597b07a59108ac5f95d6ec85fbb0bb2ea80653cdaaaaf
 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
--- a/NEWS	Fri Aug 30 14:21:42 2013 +0100
+++ b/NEWS	Fri Aug 30 14:23:03 2013 +0100
@@ -14,6 +14,11 @@
 
 New in release 2.5.0 (2012-XX-XX):
 
+* JamVM
+  - JSR 292: Invoke Dynamic
+  - JSR 335: Lambda Expressions
+  - FreeClassData: adjust method count for Miranda methods
+
 New in release 2.4.1 (2013-07-05):
 
 * Security fixes