[java-1.7.0-openjdk/f17: 7/7] Fixed PPC/PPC64 build (rh804136) -- added patches from Chris Phillips Moved OpenJDK specific patches

[Deepak Bhole]

commit 05fc088828a854fc767ed01fdbb3c0aeec1d70ad
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Fri Mar 23 15:21:11 2012 -0400

    Fixed PPC/PPC64 build (rh804136) -- added patches from Chris Phillips
    Moved OpenJDK specific patches to 1XX series

 java-1.7.0-openjdk-ppc-zero-hotspot.patch |   17 ++++++++++++++
 java-1.7.0-openjdk-ppc-zero-jdk.patch     |   14 +++++++++++
 java-1.7.0-openjdk.spec                   |   35 +++++++++++++++++++---------
 3 files changed, 55 insertions(+), 11 deletions(-)
---
diff --git a/java-1.7.0-openjdk-ppc-zero-hotspot.patch b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
new file mode 100644
index 0000000..351d459
--- /dev/null
+++ b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
@@ -0,0 +1,17 @@
+--- old/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp	2012-03-23 10:57:01.000000000 -0400
++++ new/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp	2012-03-23 10:57:00.000000000 -0400
+@@ -32,11 +32,11 @@
+ //
+ 
+ define_pd_global(bool,  DontYieldALot,           false);
+-define_pd_global(intx,  ThreadStackSize,         1536);
++define_pd_global(intx,  ThreadStackSize,         1664);
+ #ifdef _LP64
+-define_pd_global(intx,  VMThreadStackSize,       1024);
++define_pd_global(intx,  VMThreadStackSize,       1664);
+ #else
+-define_pd_global(intx,  VMThreadStackSize,       512);
++define_pd_global(intx,  VMThreadStackSize,       1152);
+ #endif // _LP64
+ define_pd_global(intx,  SurvivorRatio,           8);
+ define_pd_global(intx,  CompilerThreadStackSize, 0);
diff --git a/java-1.7.0-openjdk-ppc-zero-jdk.patch b/java-1.7.0-openjdk-ppc-zero-jdk.patch
new file mode 100644
index 0000000..15290a9
--- /dev/null
+++ b/java-1.7.0-openjdk-ppc-zero-jdk.patch
@@ -0,0 +1,14 @@
+--- old/make/common/shared/Defs-java.gmk	2012-03-23 10:56:45.000000000 -0400
++++ new/make/common/shared/Defs-java.gmk	2012-03-23 10:56:45.000000000 -0400
+@@ -83,9 +83,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=1152
+ else
+-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
++  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1664
+ endif
+ JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
+ 
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index b3f3506..4c924e0 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -253,12 +253,6 @@ Patch5:   java-1.7.0-openjdk-debugdocs.patch
 # Add debuginfo where missing
 Patch6:   %{name}-debuginfo.patch
 
-# Fix bug in jdk_generic_profile.sh
-Patch7:   %{name}-system-zlib.patch
-
-# Remove option no longer accepted by GCC
-Patch8:   %{name}-remove-mimpure-opt.patch
-
 #
 # OpenJDK specific patches
 #
@@ -271,8 +265,18 @@ Patch101: %{name}-bitmap.patch
 Patch102: %{name}-size_t.patch
 
 # Patches for Arm
-Patch103:  %{name}-arm-fixes.patch
-Patch104:  %{name}-arm-ftbfs.patch
+Patch103: %{name}-arm-fixes.patch
+Patch104: %{name}-arm-ftbfs.patch
+
+# Patch for PPC/PPC64
+Patch105: %{name}-openjdk-ppc-zero-jdk.patch
+Patch106: %{name}-openjdk-ppc-zero-hotspot.patch
+
+# Fix bug in jdk_generic_profile.sh
+Patch107: %{name}-system-zlib.patch
+
+# Remove option no longer accepted by GCC
+Patch108: %{name}-remove-mimpure-opt.patch
 
 #
 # Bootstrap patches (code with this is never shipped)
@@ -691,9 +695,6 @@ patch -l -p0 < %{PATCH5}
 patch -l -p0 < %{PATCH6}
 %endif
 
-patch -l -p0 < %{PATCH7}
-patch -l -p0 < %{PATCH8}
-
 # Type fixes
 patch -l -p0 < %{PATCH101}
 patch -l -p0 < %{PATCH102}
@@ -702,6 +703,16 @@ patch -l -p0 < %{PATCH102}
 patch -l -p0 < %{PATCH103}
 patch -l -p0 < %{PATCH104}
 
+%ifarch ppc ppc64
+# PPC fixes
+patch -l -p0 < %{PATCH105}
+patch -l -p0 < %{PATCH106}
+%endif
+
+# Misc. fixes
+patch -l -p0 < %{PATCH107}
+patch -l -p0 < %{PATCH108}
+
 # Add a "-icedtea" tag to the version
 sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)-icedtea#" openjdk/jdk/make/common/shared/Defs.gmk
 
@@ -1388,6 +1399,8 @@ exit 0
 %changelog
 * Wed Mar 21 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.3
 - Reverted fix for rhbz#740762
+- Fixed PPC/PPC64 build (rh804136) -- added patches from Chris Phillips
+- Moved OpenJDK specific patches to 1XX series
 
 * Mon Mar 12 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.2
 - Resolved rhbz#740762: java.library.path is missing some paths