[patch] fix hotspot hs20 build on powerpc and powerpc64

[Dr Andrew John Hughes]

On 23:32 Thu 24 Feb     , Matthias Klose wrote:
> hs20 on powerpc64 fails to build in the java -version check with
> 
>    java -version
>    The stack size specified is too small, Specify at least 1600k
>    Could not create the Java virtual machine.
> 
> increased the default to 2048k, for powerpc64 only.
> 
> the default zero stack size for 32bit is then 1024k for 32bit archs, 1536k for 
> 64bit archs and 2048k for powerpc. the remaining bits use the new defaults sizes 
> to build corba and the jdk, and something lower, which lets the build fail on 
> both powerpc and powerpc64.
> 
> bootstrapped on both 32bit and 64bit. That should go the trunk and the branch.
> 
>    Matthias

Approved for both HEAD and 1.10.

> 2011-02-24  Matthias Klose  <doko at ubuntu.com>
> 
> 	    * patches/hotspot/hs20/powerpc-stacksize.patch: New,
> 	    increase stack size for powerpc builds.
> 	    * Makefile.am (ICEDTEA_PATCHES): Apply.
> 
> diff -r cac9031cdd0d Makefile.am
> --- a/Makefile.am	Thu Feb 24 22:04:13 2011 +0100
> +++ b/Makefile.am	Thu Feb 24 23:07:55 2011 +0100
> @@ -334,7 +334,8 @@
>  	patches/openjdk/6997495-test_correction_6857159.patch
>  else
>  ICEDTEA_PATCHES += \
> -	patches/pr639-broken_shark_build.patch
> +	patches/pr639-broken_shark_build.patch \
> +	patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch
>  endif
>  
>  if WITH_RHINO
> diff -r cac9031cdd0d patches/hotspot/hs20/powerpc-stacksize.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/hotspot/hs20/powerpc-stacksize.patch	Thu Feb 24 23:07:55 2011 +0100
> @@ -0,0 +1,42 @@
> +--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp~	2011-02-22 17:51:24.000000000 +0100
> ++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp	2011-02-24 18:58:27.758228950 +0100
> +@@ -32,7 +32,11 @@
> + //
> + 
> + define_pd_global(bool,  DontYieldALot,           false);
> ++#ifdef __powerpc64__
> ++define_pd_global(intx,  ThreadStackSize,         2048);
> ++#else
> + define_pd_global(intx,  ThreadStackSize,         1536);
> ++#endif
> + #ifdef _LP64
> + define_pd_global(intx,  VMThreadStackSize,       1024);
> + #else
> +--- openjdk/corba/make/common/shared/Defs-java.gmk~	2011-02-24 18:56:20.278228999 +0100
> ++++ openjdk/corba/make/common/shared/Defs-java.gmk	2011-02-24 19:01:47.938229001 +0100
> +@@ -68,9 +68,9 @@
> + 
> + # 64-bit builds require a larger thread stack size.
> + ifeq ($(ARCH_DATA_MODEL), 32)
> +-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
> ++  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1024
> + else
> +-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
> ++  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=2048
> + endif
> + JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
> + 
> +--- openjdk/jdk/make/common/shared/Defs-java.gmk~	2011-02-24 20:10:20.598229000 +0100
> ++++ openjdk/jdk/make/common/shared/Defs-java.gmk	2011-02-24 20:11:45.608228331 +0100
> +@@ -75,9 +75,9 @@
> + 
> + # 64-bit builds require a larger thread stack size.
> + ifeq ($(ARCH_DATA_MODEL), 32)
> +-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
> ++  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1024
> + else
> +-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
> ++  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=2048
> + endif
> + JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
> + 


-- 
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