Mercurial > hg > release > icedtea7-2.0
changeset 2468:56dac28b4cb5
JamVM: Ignore assertions and verify options.
2011-08-15 Xerxes Ranby <xerxes@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.
| author | Xerxes Ranby <xerxes@zafena.se> |
|---|---|
| date | Fri, 02 Sep 2011 13:13:17 +0200 |
| parents | a51ca707c3d2 |
| children | 87cac0904664 |
| files | ChangeLog Makefile.am NEWS patches/jamvm/ignore-assertions-and-verify-options.patch |
| diffstat | 4 files changed, 31 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 02 13:11:34 2011 +0200 +++ b/ChangeLog Fri Sep 02 13:13:17 2011 +0200 @@ -1,3 +1,11 @@ +2011-08-15 Xerxes Rånby <xerxes@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-10 Xerxes Rånby <xerxes@zafena.se> JamVM
--- a/Makefile.am Fri Sep 02 13:11:34 2011 +0200 +++ b/Makefile.am Fri Sep 02 13:13:17 2011 +0200 @@ -301,7 +301,8 @@ if BUILD_JAMVM ICEDTEA_PATCHES += \ patches/jamvm/remove-sun.misc.Perf-debug-code.patch \ - 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
--- a/NEWS Fri Sep 02 13:11:34 2011 +0200 +++ b/NEWS Fri Sep 02 13:13:17 2011 +0200 @@ -31,6 +31,7 @@ * JamVM - JamVM is self-hosting. - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. + - Ignore assertions and verify options. - Remove empty clobber. - Use dots instead of slashes in classname for exception. - Correct thrown exception by bootstrap loader.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/ignore-assertions-and-verify-options.patch Fri Sep 02 13:13:17 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