From 3adf12463a6692089c56786d36aa43ea889042baee11098cb04e153b9d2cbf38 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 3 Nov 2020 07:32:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=351

---
 java-1_8_0-openjdk.changes |  7 +++++++
 java-1_8_0-openjdk.spec    |  6 ++++++
 s390.patch                 | 11 +++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 s390.patch

diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index cbf6b19..ff8bbbc 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov  2 16:04:46 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * s390.patch
+    + Fix build on s390 31bit
+
 -------------------------------------------------------------------
 Mon Nov  2 14:29:43 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 4987184..ed2bd15 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -190,6 +190,8 @@ Patch14:        zero-javadoc-verbose.patch
 #
 # Patch for PPC
 Patch103:       ppc-zero-hotspot.patch
+# Patch for S390
+Patch104:       s390.patch
 #
 Patch200:       JDK-8250861.patch
 
@@ -528,6 +530,10 @@ patch -p0 -i %{PATCH14}
 patch -p0 -i %{PATCH103}
 %endif
 
+%ifarch s390
+patch -p0 -i %{PATCH104}
+%endif
+
 patch -p0 -i %{PATCH200}
 
 patch -p0 -i %{PATCH2001}
diff --git a/s390.patch b/s390.patch
new file mode 100644
index 0000000..a51416e
--- /dev/null
+++ b/s390.patch
@@ -0,0 +1,11 @@
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ConcurrentMarkObjArrayProcessor.cpp	2020-11-02 16:54:31.999787520 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ConcurrentMarkObjArrayProcessor.cpp	2020-11-02 16:59:27.993852851 +0100
+@@ -41,7 +41,7 @@
+ }
+ 
+ size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) {
+-  size_t words_to_scan = MIN2(remaining, ObjArrayMarkingStride);
++  size_t words_to_scan = MIN2(remaining, (size_t) ObjArrayMarkingStride);
+ 
+   if (remaining > ObjArrayMarkingStride) {
+     push_array_slice(start_from + ObjArrayMarkingStride);