From f871405d5f63989689129df157af89ae30151525a97697c83cad86a335c27fdf Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 23 Sep 2018 06:29:49 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=298

---
 icedtea-3.8.0-s390.patch   | 11 +++++++++++
 java-1_8_0-openjdk.changes |  8 ++++++++
 java-1_8_0-openjdk.spec    |  4 ++++
 3 files changed, 23 insertions(+)
 create mode 100644 icedtea-3.8.0-s390.patch

diff --git a/icedtea-3.8.0-s390.patch b/icedtea-3.8.0-s390.patch
new file mode 100644
index 0000000..6c088df
--- /dev/null
+++ b/icedtea-3.8.0-s390.patch
@@ -0,0 +1,11 @@
+--- icedtea-3.8.0/javac.in	2018-05-29 18:11:09.984573705 +0200
++++ icedtea-3.8.0/javac.in	2018-09-21 15:08:36.603644127 +0200
+@@ -22,7 +22,7 @@
+     unless grep {$_ eq '-bootclasspath'} @ARGV;
+ my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
+ my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source',
+-		   '-XDignore.symbol.file=true', '-J-Xmx1024m');
++		   '-XDignore.symbol.file=true', '-J-Xmx786m');
+ 
+ # Work around ecj's inability to handle duplicate command-line
+ # options and unknown javac options.
diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index c5d87d8..df9434c 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Sep 23 06:22:07 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * icedtea-3.8.0-s390.patch
+    + Fix out-of-memory problem with bootstrap javac on s390
+    + Allows builds of OpenJDK 8 on s390 again (bsc#1106812)
+
 -------------------------------------------------------------------
 Wed Sep 19 08:36:31 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index ee14ec4..fbc00db 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -201,6 +201,7 @@ Patch103:       ppc-zero-hotspot.patch
 Patch104:       s390-java-opts.patch
 Patch1000:      icedtea-3.0.1-sunec.patch
 Patch1001:      java-1_8_0-openjdk-suse-desktop-files.patch
+Patch1002:      icedtea-3.8.0-s390.patch
 Patch2001:      disable-doclint-by-default.patch
 Patch2002:      aarch64.patch
 
@@ -461,6 +462,9 @@ this package unless you really need to.
 
 %patch1000 -p1
 %patch1001 -p1
+%ifarch s390
+%patch1002 -p1
+%endif
 
 %build
 export LANG=C