From 099c9fefe31fb7d74cf42091a1a71a2807322870 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Thu, 20 Sep 2018 17:25:09 +0200 Subject: [PATCH] Temporarily disable log math intrinsics on aarch64. Work-around for currently not fixed bug: https://bugs.openjdk.java.net/browse/JDK-8210858 --- ...8-workaround-disable-aarch64-intrinsic-log.patch | 13 +++++++++++++ java-11-openjdk.spec | 12 +++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch diff --git a/RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch b/RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch new file mode 100644 index 0000000..7f3c8af --- /dev/null +++ b/RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch @@ -0,0 +1,13 @@ +diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp +--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp ++++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp +@@ -5741,7 +5741,8 @@ + } + + if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) { +- StubRoutines::_dlog = generate_dlog(); ++ // disabled pending fix and retest of generated code ++ // StubRoutines::_dlog = generate_dlog(); + } + + if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) { diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 8543614..5fac14c 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -838,7 +838,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 5%{?dist} +Release: 6%{?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 @@ -914,6 +914,10 @@ Patch5: RHBZ-1565658-system-nss-SunEC.patch # back to C code. Re-enable once JDK-8210461 is fixed and # available in jdk11u. Patch6: RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch +# Temporarily disable log intrinsics on aarch64, falling +# back to C code. Re-enable once JDK-8210858 is fixed and +# available in jdk11u. +Patch7: RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch ############################################# # @@ -1185,6 +1189,7 @@ pushd %{top_level_dir_name} %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 popd # openjdk @@ -1735,6 +1740,11 @@ require "copy_jdk_configs.lua" %changelog +* Thu Sep 20 2018 Severin Gehwolf - 1:11.0.ea.28-6 +- Add patch, RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch, + so as to disable log math intrinsic on aarch64. Work-around for + JDK-8210858 + * Thu Sep 13 2018 Severin Gehwolf - 1:11.0.ea.28-5 - Add patch, RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch, so as to disable dsin/dcos math intrinsics on aarch64. Work-around for