/hg/release/icedtea6-1.10: PR640: JamVM fails to build - Unrecog...

[xranby at icedtea.classpath.org]

changeset 4a9e475fd35d in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=4a9e475fd35d
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Feb 24 22:11:20 2011 +0100

	PR640: JamVM fails to build - Unrecognised option:
	-XX:ThreadStackSize.

	2011-02-24 Xerxes Ranby <xerxes at 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.


diffstat:

4 files changed, 26 insertions(+)
ChangeLog                                  |    8 ++++++++
Makefile.am                                |    5 +++++
NEWS                                       |    1 +
patches/jamvm/ignore-more-XX-options.patch |   12 ++++++++++++

diffs (57 lines):

diff -r 6ac1377e670b -r 4a9e475fd35d ChangeLog
--- a/ChangeLog	Thu Feb 24 03:22:54 2011 +0000
+++ b/ChangeLog	Thu Feb 24 22:11:20 2011 +0100
@@ -1,3 +1,11 @@ 2011-02-24  Andrew John Hughes  <ahughes
+2011-02-24  Xerxes Ranby  <xerxes at 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  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/pr639-missing_shark_include.patch:
diff -r 6ac1377e670b -r 4a9e475fd35d Makefile.am
--- a/Makefile.am	Thu Feb 24 03:22:54 2011 +0000
+++ b/Makefile.am	Thu Feb 24 22:11:20 2011 +0100
@@ -354,6 +354,11 @@ ICEDTEA_PATCHES += \
 ICEDTEA_PATCHES += \
 	patches/cacao/ignore-jdi-tests.patch \
 	patches/cacao/ignore-tests.patch
+endif
+
+if BUILD_JAMVM
+ICEDTEA_PATCHES += \
+	patches/jamvm/ignore-more-XX-options.patch
 endif
 
 if ENABLE_PULSE_JAVA
diff -r 6ac1377e670b -r 4a9e475fd35d NEWS
--- a/NEWS	Thu Feb 24 03:22:54 2011 +0000
+++ b/NEWS	Thu Feb 24 22:11:20 2011 +0100
@@ -441,6 +441,7 @@ New in release 1.10 (2011-XX-XX):
   - PR635: zero fails to build on icedtea6 trunk 20110217 with hs20
   - PR586: Sources missing from src.zip
   - PR639: Add missing include line, paths and LLVM flags for Shark.
+  - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
 * Cleanup
   - Patches are no longer prefixed with 'icedtea-'.
   - All m4 macros are now prefixed with 'IT_' to denote their origin correctly.
diff -r 6ac1377e670b -r 4a9e475fd35d patches/jamvm/ignore-more-XX-options.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/ignore-more-XX-options.patch	Thu Feb 24 22:11:20 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) {