Mercurial > hg > release > icedtea6-1.10

changeset 2469:b442b847be56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix hotspot hs20 build on powerpc and powerpc64 2011-02-24 Matthias Klose <doko@ubuntu.com> * patches/hotspot/hs20/powerpc-stacksize.patch: New, increase stack size for powerpc builds. * Makefile.am (ICEDTEA_PATCHES): Apply.
author doko@ubuntu.com
date Fri, 25 Feb 2011 01:17:08 +0100
parents 4a9e475fd35d
children f1416523b090
files ChangeLog Makefile.am patches/hotspot/hs20/powerpc-stacksize.patch
diffstat 3 files changed, 50 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 24 22:11:20 2011 +0100
+++ b/ChangeLog	Fri Feb 25 01:17:08 2011 +0100
@@ -1,3 +1,9 @@
+2011-02-24  Matthias Klose  <doko@ubuntu.com>
+
+	    * patches/hotspot/hs20/powerpc-stacksize.patch: New,
+	    increase stack size for powerpc builds.
+	    * Makefile.am (ICEDTEA_PATCHES): Apply.
+
 2011-02-24  Xerxes Ranby  <xerxes@zafena.se>
 
 	PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
--- a/Makefile.am	Thu Feb 24 22:11:20 2011 +0100
+++ b/Makefile.am	Fri Feb 25 01:17:08 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs20/powerpc-stacksize.patch	Fri Feb 25 01:17:08 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%)
+