From 5fc2f2aab4de0fccf82d27f3c19e7e5d1dbe4dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Fri, 23 May 2014 08:56:40 +0200
Subject: [PATCH] - Enable build on s390/s390x

---
 java-1.8.0-openjdk-s390-java-opts.patch | 18 ++++++++++++++++++
 java-1.8.0-openjdk.spec                 | 12 +++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 java-1.8.0-openjdk-s390-java-opts.patch

diff --git a/java-1.8.0-openjdk-s390-java-opts.patch b/java-1.8.0-openjdk-s390-java-opts.patch
new file mode 100644
index 0000000..79108b8
--- /dev/null
+++ b/java-1.8.0-openjdk-s390-java-opts.patch
@@ -0,0 +1,18 @@
+diff -up jdk8/common/autoconf/boot-jdk.m4.s390 jdk8/common/autoconf/boot-jdk.m4
+--- jdk8/common/autoconf/boot-jdk.m4.s390	2014-03-11 16:01:27.000000000 -0400
++++ jdk8/common/autoconf/boot-jdk.m4	2014-05-21 11:50:36.507890197 -0400
+@@ -315,12 +315,12 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
+     fi
+ 
+     # Minimum amount of heap memory.
+-    ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA])
++    ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs,[$JAVA])
+     if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+       # Why does macosx need more heap? Its the huge JDK batch.
+       ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA])
+     else
+-      ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA])
++      ADD_JVM_ARG_IF_OK([-Xmx768M],boot_jdk_jvmargs,[$JAVA])
+     fi
+     # When is adding -client something that speeds up the JVM?
+     # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 9ee1c4b..b890302 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -135,7 +135,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 5.%{buildver}%{?dist}
+Release: 6.%{buildver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -211,6 +211,8 @@ Patch7: include-all-srcs.patch
 # Allow icedtea-web to build
 Patch99: applet-hole.patch
 
+# JVM heap size changes for s390 (thanks to aph)
+Patch100: %{name}-s390-java-opts.patch
 # Type fixing for s390
 Patch102: %{name}-size_t.patch
 
@@ -436,8 +438,9 @@ sh %{SOURCE12}
 
 %patch99
 
-# Type fixes for s390
-%ifarch s390 s390x
+# s390 build fixes
+%ifarch s390
+%patch100
 %patch102
 %endif
 
@@ -1119,6 +1122,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Fri May 23 2014 Dan Horák <dan[at]danny.cz> - 1:1.8.0.5-6.b13
+- Enable build on s390/s390x
+
 * Tue May 20 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.5-5.b13
 - Only check for debug symbols in libjvm if it exists.