/hg/icedtea6: JamVM: Ignore all unknown options.

[xranby at icedtea.classpath.org]

changeset 0df8f7938769 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0df8f7938769
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Mar 03 15:32:46 2011 +0100

	JamVM: Ignore all unknown options.

	2011-03-03 Xerxes Ranby <xerxes at zafena.se>

	 JamVM: Ignore all unknown options.
		* Makefile.am: Replaced JamVM patch.
		* patches/jamvm/ignore-more-XX-options.patch: Removed.
		* patches/jamvm/ignore-unknown-options.patch: Added.


diffstat:

3 files changed, 11 insertions(+), 20 deletions(-)
ChangeLog                                  |    5 +++++
patches/jamvm/ignore-more-XX-options.patch |   20 --------------------
patches/jamvm/ignore-unknown-options.patch |    6 ++++++

diffs (88 lines):

diff -r 84ca681adf9a -r 0df8f7938769 ChangeLog
--- a/ChangeLog	Thu Mar 03 01:49:30 2011 +0000
+++ b/ChangeLog	Thu Mar 03 15:32:46 2011 +0100
@@ -1,3 +1,10 @@ 2011-03-03  Andrew John Hughes  <ahughes
+2011-03-03  Xerxes Ranby  <xerxes at zafena.se>
+
+	JamVM: Ignore all unknown options.
+	* Makefile.am: Replaced JamVM patch.
+	* patches/jamvm/ignore-more-XX-options.patch: Removed.
+	* patches/jamvm/ignore-unknown-options.patch: Added.
+
 2011-03-03  Andrew John Hughes  <ahughes at redhat.com>
 
 	* INSTALL: Update documentation
diff -r 84ca681adf9a -r 0df8f7938769 Makefile.am
--- a/Makefile.am	Thu Mar 03 01:49:30 2011 +0000
+++ b/Makefile.am	Thu Mar 03 15:32:46 2011 +0100
@@ -358,7 +358,7 @@ endif
 
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
-	patches/jamvm/ignore-more-XX-options.patch
+	patches/jamvm/ignore-unknown-options.patch
 endif
 
 if ENABLE_PULSE_JAVA
diff -r 84ca681adf9a -r 0df8f7938769 patches/jamvm/ignore-more-XX-options.patch
--- a/patches/jamvm/ignore-more-XX-options.patch	Thu Mar 03 01:49:30 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-Index: jamvm/jamvm/src/jni.c
-===================================================================
---- jamvm/jamvm.orig/src/jni.c	2011-02-23 09:54:17.000000000 +0100
-+++ jamvm/jamvm/src/jni.c	2011-02-23 09:58:21.000000000 +0100
-@@ -1638,6 +1638,36 @@
- #endif
-         /* Compatibility options */
-         } else if(strncmp(string, "-XX:PermSize=", 13) == 0 ||
-+                  strncmp(string, "-esa", 4) == 0 ||
-+                  strncmp(string, "-Xbatch", 7) == 0 ||
-+                  strncmp(string, "-Xcomp", 6) == 0 ||
-+                  strncmp(string, "-Xverify:all", 12) == 0 ||
-+                  strncmp(string, "-XX:+AggressiveOpts", 19) == 0 ||
-+                  strncmp(string, "-XX:-BlockLayoutRotateLoops", 27) == 0 ||
-+                  strncmp(string, "-XX:CompileCommand=", 19) == 0 ||
-+                  strncmp(string, "-XX:CompileOnly=", 16) == 0 ||
-+                  strncmp(string, "-XX:CompileThreshold=", 21) == 0 ||
-+                  strncmp(string, "-XX:+DeoptimizeALot", 19) == 0 ||
-+                  strncmp(string, "-XX:+DoEscapeAnalysis", 21) == 0 ||
-+                  strncmp(string, "-XX:HeapBaseMinAddress=", 23) == 0 ||
-+                  strncmp(string, "-XX:+IgnoreUnrecognizedVMOptions", 32) == 0 ||
-+                  strncmp(string, "-XX:-Inline", 11) == 0 ||
-+                  strncmp(string, "-XX:-InlineObjectHash", 21) == 0 ||
-+                  strncmp(string, "-XX:InlineSmallCode=", 20) == 0 ||
-+                  strncmp(string, "-XX:LoopUnrollLimit=", 20) == 0 ||
-+                  strncmp(string, "-XX:-LoopUnswitching", 20) == 0 ||
-+                  strncmp(string, "-XX:MaxInlineSize=", 18) == 0 ||
-+                  strncmp(string, "-XX:+OptimizeFill", 17) == 0 ||
-+                  strncmp(string, "-XX:+PrintCompilation", 21) == 0 ||
-+                  strncmp(string, "-XX:-ProfileInterpreter", 23) == 0 ||
-+                  strncmp(string, "-XX:+ScavengeALot", 17) == 0 ||
-+                  strncmp(string, "-XX:ThreadStackSize=", 20) == 0 ||
-+                  strncmp(string, "-XX:+UnlockDiagnosticVMOptions", 30) == 0 ||
-+                  strncmp(string, "-XX:-UseCompressedOops", 22) == 0 ||
-+                  strncmp(string, "-XX:+UseCompressedOops", 22) == 0 ||
-+                  strncmp(string, "-XX:+UseConcMarkSweepGC", 23) == 0 ||
-+                  strncmp(string, "-XX:UseSSE=", 11) == 0 ||
-+                  strncmp(string, "-XX:+VerifyBeforeGC", 19) == 0 ||
-                   strncmp(string, "-XX:MaxPermSize=", 16) == 0) {
-             /* Ignore */
-         } else if(!vm_args->ignoreUnrecognized) {
diff -r 84ca681adf9a -r 0df8f7938769 patches/jamvm/ignore-unknown-options.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/ignore-unknown-options.patch	Thu Mar 03 15:32:46 2011 +0100
@@ -0,0 +1,13 @@
+Index: jamvm/jamvm/src/jni.c
+===================================================================
+--- jamvm.orig/jamvm/src/jni.c	2011-02-27 04:35:37.000000000 +0100
++++ jamvm/jamvm/src/jni.c	2011-03-03 13:48:31.897900208 +0100
+@@ -1642,7 +1642,7 @@
+             /* Ignore */
+         } else if(!vm_args->ignoreUnrecognized) {
+             optError(args, "Unrecognised option: %s\n", string);
+-            goto error;
++            /* Ignore */
+         }
+     }
+