/hg/icedtea6: JamVM: Ignore assertions and verify options.

[xranby at icedtea.classpath.org]

changeset 0e26a40dddf3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0e26a40dddf3
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Aug 15 12:08:18 2011 +0200

	JamVM: Ignore assertions and verify options.

	2011-08-15 Xerxes R?nby <xerxes at zafena.se>

	 JamVM
		- Ignore assertions and verify options.
		* NEWS: Updated.
		* patches/jamvm/ignore-assertions-and-verify-options.patch: New patch.
		* Makefile.am: Apply JamVM patch.


diffstat:

 ChangeLog                                                |   8 ++++++
 Makefile.am                                              |   3 +-
 NEWS                                                     |   1 +
 patches/jamvm/ignore-assertions-and-verify-options.patch |  19 ++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletions(-)

diffs (63 lines):

diff -r a690c9e7e3bc -r 0e26a40dddf3 ChangeLog
--- a/ChangeLog	Mon Aug 15 11:49:11 2011 +0200
+++ b/ChangeLog	Mon Aug 15 12:08:18 2011 +0200
@@ -1,3 +1,11 @@
+2011-08-15  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	JamVM
+	- Ignore assertions and verify options.
+	* NEWS: Updated.
+	* patches/jamvm/ignore-assertions-and-verify-options.patch: New patch.
+	* Makefile.am: Apply JamVM patch.
+
 2011-08-15  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	JamVM
diff -r a690c9e7e3bc -r 0e26a40dddf3 Makefile.am
--- a/Makefile.am	Mon Aug 15 11:49:11 2011 +0200
+++ b/Makefile.am	Mon Aug 15 12:08:18 2011 +0200
@@ -397,7 +397,8 @@
 
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
-        patches/jamvm/jmm_GetLongAttribute_201.patch
+        patches/jamvm/jmm_GetLongAttribute_201.patch \
+        patches/jamvm/ignore-assertions-and-verify-options.patch
 endif
 
 if ENABLE_PULSE_JAVA
diff -r a690c9e7e3bc -r 0e26a40dddf3 NEWS
--- a/NEWS	Mon Aug 15 11:49:11 2011 +0200
+++ b/NEWS	Mon Aug 15 12:08:18 2011 +0200
@@ -375,6 +375,7 @@
   - Threadlist & threadobject improvements.
 * JamVM
   - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit.
+  - Ignore assertions and verify options.
   - Fix typo in definition of ACC_MIRANDA.
   - Intern strings when creating a StackTraceElement.
   - Remove empty clobber.
diff -r a690c9e7e3bc -r 0e26a40dddf3 patches/jamvm/ignore-assertions-and-verify-options.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/ignore-assertions-and-verify-options.patch	Mon Aug 15 12:08:18 2011 +0200
@@ -0,0 +1,20 @@
+Index: jamvm/jamvm/src/init.c
+===================================================================
+--- jamvm.orig/jamvm/src/init.c	2011-08-12 14:12:00.775411188 +0200
++++ jamvm/jamvm/src/init.c	2011-08-12 16:22:24.110205028 +0200
+@@ -272,6 +272,15 @@
+     /* Compatibility options */
+     } else if(strcmp(string,  "-Xcomp")  == 0 ||
+               strcmp(string,  "-Xbatch") == 0 ||
++              strcmp(string,  "-ea") == 0 ||
++              strcmp(string,  "-da") == 0 ||
++              strcmp(string,  "-dsa") == 0 ||
++              strcmp(string,  "-esa") == 0 ||
++              strncmp(string, "-ea:", 4) == 0 ||
++              strncmp(string, "-da:", 4) == 0 ||
++              strncmp(string, "-dsa:", 5) == 0 ||
++              strncmp(string, "-esa:", 5) == 0 ||
++              strncmp(string, "-Xverify:", 9) == 0 ||
+               strncmp(string, "-XX:", 4) == 0) {
+         /* Ignore */
+     } else