Mercurial > hg > release > icedtea7-2.0
changeset 2400:e90fab517c39
PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
2011-02-24 Xerxes Ranby <xerxes@zafena.se>
PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
* NEWS: Updated.
* Makefile.am (ICEDTEA_PATCHES):
Add JamVM patches if BUILD_JAMVM are defined.
* patches/jamvm/ignore-more-XX-options.patch: New JamVM patch.
| author | Xerxes R?nby <xerxes@zafena.se> |
|---|---|
| date | Thu, 19 May 2011 23:34:43 +0100 |
| parents | decad30090ca |
| children | 7fa3d3774850 |
| files | ChangeLog Makefile.am NEWS patches/jamvm/ignore-more-XX-options.patch |
| diffstat | 4 files changed, 27 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 24 21:43:07 2011 +0100 +++ b/ChangeLog Thu May 19 23:34:43 2011 +0100 @@ -1,3 +1,11 @@ +2011-02-24 Xerxes Ranby <xerxes@zafena.se> + + PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. + * NEWS: Updated. + * Makefile.am (ICEDTEA_PATCHES): + Add JamVM patches if BUILD_JAMVM are defined. + * patches/jamvm/ignore-more-XX-options.patch: New JamVM patch. + 2011-02-24 Xerxes Ranby <xerxes@zafena.se> * Makefile.am (stamps/download-cacao.stamp): @@ -6,7 +14,7 @@ (stamps/download-jamvm.stamp): Likewise for JAMVM_SRC_ZIP. (stamps/download-openjdk.stamp): Likewise for OPENJDK_SRC_ZIP and HOTSPOT_SRC_ZIP. - + 2011-02-23 Xerxes Ranby <xerxes@zafena.se> JamVM: configure --with-jamvm-src-zip
--- a/Makefile.am Thu Feb 24 21:43:07 2011 +0100 +++ b/Makefile.am Thu May 19 23:34:43 2011 +0100 @@ -310,6 +310,11 @@ patches/cacao/ignore-tests.patch endif +if BUILD_JAMVM +ICEDTEA_PATCHES += \ + patches/jamvm/ignore-more-XX-options.patch +endif + if ENABLE_PULSE_JAVA ICEDTEA_PATCHES += \ patches/pulse-soundproperties.patch
--- a/NEWS Thu Feb 24 21:43:07 2011 +0100 +++ b/NEWS Thu May 19 23:34:43 2011 +0100 @@ -7,6 +7,7 @@ * Allow the location of the JamVM source zip to be specified using --with-jamvm-src-zip * Bug fixes - PR616, PR99: Don't statically link libstdc++ + - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. * Zero/Shark - Match Shark in icedtea6, makes OSR work by removing vestigal check. - LLVM 2.7 non-product fixes.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/ignore-more-XX-options.patch Thu May 19 23:34:43 2011 +0100 @@ -0,0 +1,12 @@ +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 @@ + #endif + /* Compatibility options */ + } else if(strncmp(string, "-XX:PermSize=", 13) == 0 || ++ strncmp(string, "-XX:ThreadStackSize=", 20) == 0 || + strncmp(string, "-XX:MaxPermSize=", 16) == 0) { + /* Ignore */ + } else if(!vm_args->ignoreUnrecognized) {