From 68ef862ac2f8b600a7c59f46c9bce6f5e27f6c70 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Oct 12 2018 14:18:07 +0000
Subject: Add another optimization gap fix for Zero.


Add patch 8210425-03-rh1630426-hotspot-opt-fix-zero.patch which
performs the same opt steps for Zero arches when they are being
built. This issue showed up on arm (32 bit) and s390x
only as those are Zero arches for JDK 8.

---

diff --git a/8210425-03-rh1630426-hotspot-opt-fix-zero.patch b/8210425-03-rh1630426-hotspot-opt-fix-zero.patch
new file mode 100644
index 0000000..6c1ebad
--- /dev/null
+++ b/8210425-03-rh1630426-hotspot-opt-fix-zero.patch
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -30,10 +30,13 @@ ifeq ($(USE_CLANG), true)
+   WARNING_FLAGS += -Wno-undef
+ endif
+ 
+-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++ifeq ($(OPT_CFLAGS_NO_FMA),)
++  OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
++  OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
++else
++  OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++  OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
++endif
+ 
+ # Specify that the CPU is little endian, if necessary
+ ifeq ($(ZERO_ENDIANNESS), little)
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index ab60314..bb8821c 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -964,7 +964,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 6%{?dist}
+Release: 7%{?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
@@ -1135,6 +1135,9 @@ Patch623: 8210425-01-rh1630426-hotspot-opt-fix.patch
 # 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
 #          Aarch64-port 8u local part
 Patch624: 8210425-02-rh1630426-hotspot-opt-fix-aarch64.patch
+# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
+#          Zero part of the fix for (arm/s390 arches)
+Patch625: 8210425-03-rh1630426-hotspot-opt-fix-zero.patch
 
 #############################################
 #
@@ -1634,6 +1637,7 @@ sh %{SOURCE12}
 %patch622
 %patch623
 %patch624
+%patch625
 
 # RPM-only fixes
 %patch525
@@ -2284,6 +2288,11 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Fri Oct 12 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.181.b15-7
+- Add patch 8210425-03-rh1630426-hotspot-opt-fix-zero.patch:
+  - Annother fix for optimization gaps (annocheck issues)
+  - Zero 8u version fix was missing. Hence, only shows up on Zero arches.
+
 * Mon Oct 08 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.181.b15-6
 - Refreshed upstreamed patches (from 8u202):
   - 8044235-include-all-srcs.patch: src.zip should include all sources.