From 5d18daa2adf45d086db9ff4072b3ff8b944a4b95 Mon Sep 17 00:00:00 2001 From: jiri vanek Date: Oct 30 2018 10:25:42 +0000 Subject: Merge #16 `Use upstream's Aarch64 math intrinsics disable patch` --- diff --git a/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch b/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch new file mode 100644 index 0000000..734ee89 --- /dev/null +++ b/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch @@ -0,0 +1,35 @@ +# HG changeset patch +# User adinn +# Date 1537977709 -3600 +# Wed Sep 26 17:01:49 2018 +0100 +# Node ID 18426968f11cd0c3b238dec365003798d07576fc +# Parent 0abe9de66ea9e1371bf35a2394daf31d8bfada98 +8211105: AArch64: Disable cos/sin and log intrinsics in jdk11u pending fix +Summary: AArch64 cos/sin and log intrinsics are currently broken so should be disabled +Reviewed-by: aph, shade + +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,15 +5741,18 @@ + } + + if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) { +- StubRoutines::_dlog = generate_dlog(); ++ // disabled pending fix and retest of generated code via JDK-8210858 ++ // StubRoutines::_dlog = generate_dlog(); + } + + if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) { +- StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false); ++ // disabled pending fix and retest of generated code via JDK-8210461 ++ // StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false); + } + + if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) { +- StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true); ++ // disabled pending fix and retest of generated code via JDK-8210461 ++ // StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true); + } + } + diff --git a/RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch b/RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch deleted file mode 100644 index 7edc7a1..0000000 --- a/RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r 1ddf9a99e4ad src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp ---- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Wed Aug 22 21:50:12 2018 +0200 -+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Thu Sep 13 13:51:53 2018 +0100 -@@ -5745,11 +5745,13 @@ - } - - if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) { -- StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false); -+ // disabled pending fix and retest of generated code -+ // StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false); - } - - if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) { -- StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true); -+ // disabled pending fix and retest of generated code -+ // StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true); - } - } diff --git a/RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch b/RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch deleted file mode 100644 index 7f3c8af..0000000 --- a/RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 206d95f..17d6c45 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -849,7 +849,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 2%{?dist} +Release: 3%{?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 @@ -921,14 +921,6 @@ Patch3: libjpeg-turbo-1.4-compat.patch Patch4: RHBZ-1249083-system-crypto-policy-PR3183.patch # System NSS via SunEC Provider Patch5: RHBZ-1565658-system-nss-SunEC.patch -# Temporarily disable dsin/dcos intrinsics on aarch64, falling -# 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 ############################################# # @@ -953,7 +945,10 @@ Patch10: JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch Patch11: JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch # 8210703, RHBZ#1632174: vmStructs.cpp compiled with -O0 Patch12: JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch - +# 8211105, RHBZ-1628612, RHBZ-1630996: Temporarily disable dsin/dcos/log +# intrinsics on aarch64, falling back to C code. Re-enable once JDK-8210461 +# is fixed and available in jdk11u. +Patch6: JDK-8211105-aarch64-log-sin-intrinsics-disable.patch BuildRequires: autoconf BuildRequires: automake @@ -1218,7 +1213,6 @@ pushd %{top_level_dir_name} %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 @@ -1775,6 +1769,14 @@ require "copy_jdk_configs.lua" %changelog +* Mon Oct 29 2018 Severin Gehwolf - 1:11.0.1.13-3 +- Use upstream's version of Aarch64 intrinsics disable patch: + - Removed: + RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch + RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch + - Superceded by: + JDK-8211105-aarch64-log-sin-intrinsics-disable.patch + * Thu Oct 18 2018 Severin Gehwolf - 1:11.0.1.13-2 - Use LTS designator in version output for RHEL.