/hg/icedtea6: Make JamVM ignore 29 more unrecognised options tha...

[xranby at icedtea.classpath.org]

changeset 6c809c02b993 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6c809c02b993
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Mar 02 23:28:59 2011 +0100

	Make JamVM ignore 29 more unrecognised options that fail on jtreg.

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

	 * patches/jamvm/ignore-more-XX-options.patch: Make
	JamVM ignore more unrecognised options that fail on jtreg.
	        -esa, -Xbatch, -Xcomp, -Xverify:all, -XX:+AggressiveOpts,
	        -XX:-BlockLayoutRotateLoops, -XX:CompileCommand=, -XX:CompileOnly=,
	        -XX:CompileThreshold, -XX:+DeoptimizeALot, -XX:+DoEscapeAnalysis,
	        -XX:HeapBaseMinAddress, -XX:+IgnoreUnrecognizedVMOptions,
	-XX:-Inline,
	        -XX:-InlineObjectHash, -XX:InlineSmallCode=, -XX:LoopUnrollLimit=,
	        -XX:-LoopUnswitching, -XX:MaxInlineSize=, -XX:+OptimizeFill,
	        -XX:+PrintCompilation, -XX:-ProfileInterpreter, -XX:+ScavengeALot,
	        -XX:+UnlockDiagnosticVMOptions, -XX:-UseCompressedOops,
	        -XX:+UseCompressedOops, -XX:+UseConcMarkSweepGC, -XX:UseSSE= and
	        -XX:+VerifyBeforeGC


diffstat:

2 files changed, 22 insertions(+), 1 deletion(-)
ChangeLog                                  |    9 +++++++++
patches/jamvm/ignore-more-XX-options.patch |   14 +++++++++++++-

diffs (67 lines):

diff -r 29c90e090d7b -r 6c809c02b993 ChangeLog
--- a/ChangeLog	Wed Mar 02 18:41:37 2011 +0100
+++ b/ChangeLog	Wed Mar 02 23:28:59 2011 +0100
@@ -1,3 +1,18 @@ 2011-03-02  Pavel Tisnovsky  <ptisnovs at r
+2011-03-02  Xerxes Ranby  <xerxes at zafena.se>
+
+	* patches/jamvm/ignore-more-XX-options.patch:
+	Make JamVM ignore more unrecognised options that fail on jtreg.
+	-esa, -Xbatch, -Xcomp, -Xverify:all, -XX:+AggressiveOpts,
+	-XX:-BlockLayoutRotateLoops, -XX:CompileCommand=, -XX:CompileOnly=,
+	-XX:CompileThreshold, -XX:+DeoptimizeALot, -XX:+DoEscapeAnalysis,
+	-XX:HeapBaseMinAddress, -XX:+IgnoreUnrecognizedVMOptions, -XX:-Inline,
+	-XX:-InlineObjectHash, -XX:InlineSmallCode=, -XX:LoopUnrollLimit=,
+	-XX:-LoopUnswitching, -XX:MaxInlineSize=, -XX:+OptimizeFill,
+	-XX:+PrintCompilation, -XX:-ProfileInterpreter, -XX:+ScavengeALot,
+	-XX:+UnlockDiagnosticVMOptions, -XX:-UseCompressedOops,
+	-XX:+UseCompressedOops, -XX:+UseConcMarkSweepGC, -XX:UseSSE= and
+	-XX:+VerifyBeforeGC
+
 2011-03-02  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am:
diff -r 29c90e090d7b -r 6c809c02b993 patches/jamvm/ignore-more-XX-options.patch
--- a/patches/jamvm/ignore-more-XX-options.patch	Wed Mar 02 18:41:37 2011 +0100
+++ b/patches/jamvm/ignore-more-XX-options.patch	Wed Mar 02 23:28:59 2011 +0100
@@ -2,11 +2,40 @@ 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,7 @@
+@@ -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) {