/hg/icedtea6: JamVM: LP827463: Fix OpenJDK enclosingMethodInfo()...

[xranby at icedtea.classpath.org]

changeset 759b17771e6a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=759b17771e6a
author: Xerxes Ranby <xerxes at zafena.se>
date: Fri Aug 19 13:36:29 2011 +0200

	JamVM: LP827463: Fix OpenJDK enclosingMethodInfo(), Updated JamVM to
	2011-08-19 revision.

	2011-08-19 Xerxes Ranby <xerxes at zafena.se>

	 JamVM
		- LP827463: Fix OpenJDK enclosingMethodInfo().
		- "Fix" handling of CLI bootclasspath options.
		- Fix for StackTraceElement checkin.
		* NEWS: Updated.
		* patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.pa
	tch: Replaced by upstream, Fix for StackTraceElement
	checkin, changeset
	500a6c2f3b9769c73d872ea78de4237e427a443e.
		* Makefile.am (ICEDTEA_PATCHES): Remove upstreamed JamVM
	patch. (JAMVM_VERSION): Updated JamVM to 2011-08-19
	revision. (JAMVM_SHA256SUM): Updated.


diffstat:

 ChangeLog                                                               |  15 ++++++++++
 Makefile.am                                                             |   7 ++--
 NEWS                                                                    |   4 ++
 patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch |  12 --------
 4 files changed, 22 insertions(+), 16 deletions(-)

diffs (84 lines):

diff -r 1bec501e2dc7 -r 759b17771e6a ChangeLog
--- a/ChangeLog	Tue Aug 16 16:09:29 2011 +0200
+++ b/ChangeLog	Fri Aug 19 13:36:29 2011 +0200
@@ -1,3 +1,18 @@
+2011-08-19  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	JamVM
+	- LP827463: Fix OpenJDK enclosingMethodInfo().
+	- "Fix" handling of CLI bootclasspath options.
+	- Fix for StackTraceElement checkin.
+	* NEWS: Updated.
+	* patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch:
+	  Replaced by upstream, Fix for StackTraceElement checkin,
+	  changeset 500a6c2f3b9769c73d872ea78de4237e427a443e.
+	* Makefile.am
+	(ICEDTEA_PATCHES): Remove upstreamed JamVM patch.
+	(JAMVM_VERSION): Updated JamVM to 2011-08-19 revision.
+	(JAMVM_SHA256SUM): Updated.
+
 2011-08-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: added new patch
diff -r 1bec501e2dc7 -r 759b17771e6a Makefile.am
--- a/Makefile.am	Tue Aug 16 16:09:29 2011 +0200
+++ b/Makefile.am	Fri Aug 19 13:36:29 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 = b8e5dbad856be3b3bb0309467264053d1e2c58a9
-JAMVM_SHA256SUM = 9178f7d85851f6c908de1e1114ec158dc5fbc4aa4025478cac16a12459ac9a51
+JAMVM_VERSION = 15f0fcf749071c7fa1bf0431e044e55143e94844
+JAMVM_SHA256SUM = af0213333302193f9eda0bd852b2d0419484160e1853235acdb83ed73829a1f8
 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,8 +399,7 @@
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
         patches/jamvm/jmm_GetLongAttribute_201.patch \
-        patches/jamvm/ignore-assertions-and-verify-options.patch \
-	patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch
+	patches/jamvm/ignore-assertions-and-verify-options.patch
 endif
 
 if ENABLE_PULSE_JAVA
diff -r 1bec501e2dc7 -r 759b17771e6a NEWS
--- a/NEWS	Tue Aug 16 16:09:29 2011 +0200
+++ b/NEWS	Fri Aug 19 13:36:29 2011 +0200
@@ -6,6 +6,7 @@
 DX  - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X
 GX  - http://bugs.gentoo.org/show_bug.cgi?id=X
 CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X
+LPX - https://bugs.launchpad.net/bugs/X 
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
@@ -376,6 +377,9 @@
   - Threadlist & threadobject improvements.
 * JamVM
   - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit.
+  - LP827463: Fix OpenJDK enclosingMethodInfo().
+  - "Fix" handling of CLI bootclasspath options.
+  - Fix for StackTraceElement checkin. 
   - Ignore assertions and verify options.
   - Fix typo in definition of ACC_MIRANDA.
   - Intern strings when creating a StackTraceElement.
diff -r 1bec501e2dc7 -r 759b17771e6a patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch
--- a/patches/jamvm/4dbc2ee340a600fc17451dfbcfc09e1f9844fc59-regression.patch	Tue Aug 16 16:09:29 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Index: jamvm/jamvm/src/excep.c
-===================================================================
---- jamvm.orig/jamvm/src/excep.c	2011-08-15 14:19:32.757781965 +0200
-+++ jamvm/jamvm/src/excep.c	2011-08-15 14:19:43.601836044 +0200
-@@ -311,7 +311,7 @@
-     executeMethod(ste, ste_init_mb,
-                   findInternedString(classname), 
-                   findInternedString(methodname), 
--                  findInternedString(filename),
-+                  filename,
-                   is_native ? -2 : mapPC2LineNo(mb, pc));
- 
-     if(exceptionOccurred())