Mercurial > hg > release > icedtea7-2.3
changeset 2403:d8aa2906143e
JamVM: Ignore all unknown options.
2011-03-03 Xerxes Ranby <xerxes@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.
author | Xerxes R?nby <xerxes@zafena.se> |
---|---|
date | Thu, 03 Mar 2011 15:32:46 +0100 |
parents | 474b01bedbd0 |
children | 1a8a40f21e15 |
files | ChangeLog Makefile.am patches/jamvm/ignore-more-XX-options.patch patches/jamvm/ignore-unknown-options.patch |
diffstat | 4 files changed, 21 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 02 23:28:59 2011 +0100 +++ b/ChangeLog Thu Mar 03 15:32:46 2011 +0100 @@ -1,3 +1,10 @@ +2011-03-03 Xerxes Ranby <xerxes@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-02 Xerxes Ranby <xerxes@zafena.se> * patches/jamvm/ignore-more-XX-options.patch:
--- a/Makefile.am Wed Mar 02 23:28:59 2011 +0100 +++ b/Makefile.am Thu Mar 03 15:32:46 2011 +0100 @@ -312,7 +312,7 @@ if BUILD_JAMVM ICEDTEA_PATCHES += \ - patches/jamvm/ignore-more-XX-options.patch + patches/jamvm/ignore-unknown-options.patch endif if ENABLE_PULSE_JAVA
--- a/patches/jamvm/ignore-more-XX-options.patch Wed Mar 02 23:28:59 2011 +0100 +++ /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) {
--- /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 */ + } + } +