RFC: add JamVM patch queue and add ignore-more-XX-options JamVM patch.

[Dr Andrew John Hughes]

On 17:16 Thu 24 Feb     , Xerxes Rånby wrote:
> Hi the attached patch creates a IcedTea patch queue to be applied on top of the extracted jamvm sources.
> The patch also fix PR640
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=640
> by making JamVM ignore the -XX:ThreadStackSize option.
> 
> Ok to push?
> 
> Cheers
> Xerxes

Does JamVM now build?

I didn't realise adding the patches would be that simple but I guess the patching
is after JamVM is extracted.

Please commit to HEAD and 1.10 branch.

> Index: icedtea6/Makefile.am
> ===================================================================
> --- icedtea6.orig/Makefile.am	2011-02-24 16:41:59.365413137 +0100
> +++ icedtea6/Makefile.am	2011-02-24 16:48:21.413908589 +0100
> @@ -356,6 +356,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
> Index: icedtea6/patches/jamvm/ignore-more-XX-options.patch
> ===================================================================
> --- /dev/null	1970-01-01 00:00:00.000000000 +0000
> +++ icedtea6/patches/jamvm/ignore-more-XX-options.patch	2011-02-24 16:47:09.269910195 +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) {


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37