removed patch104 pr3458-rh1540242-aarch64.patch

This commit is contained in:
Jiri Vanek 2018-07-23 17:09:16 +02:00
parent 6e6e3ea448
commit 1b2b62a758
2 changed files with 5 additions and 18 deletions

View File

@ -1108,8 +1108,6 @@ Patch100: %{name}-s390-java-opts.patch
Patch102: %{name}-size_t.patch Patch102: %{name}-size_t.patch
# s390: PR3593: Use "%z" for size_t on s390 as size_t != intptr_t # s390: PR3593: Use "%z" for size_t on s390 as size_t != intptr_t
Patch103: pr3593-s390-size_t_format_flags.patch Patch103: pr3593-s390-size_t_format_flags.patch
# AArch64: Fix more cases of missing return statements
Patch104: pr3458-rh1540242-aarch64.patch
# x86: S8199936, PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations (-mstackrealign workaround) # x86: S8199936, PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations (-mstackrealign workaround)
Patch105: 8199936-pr3533-workaround.patch Patch105: 8199936-pr3533-workaround.patch
# AArch64: PR3519: Fix further functions with a missing return value (AArch64) # AArch64: PR3519: Fix further functions with a missing return value (AArch64)
@ -1582,11 +1580,6 @@ sh %{SOURCE12}
%patch102 %patch102
%patch103 %patch103
# AArch64 fixes
%if %{use_shenandoah_hotspot}
%else
%patch104
%endif
%patch106 %patch106
# x86 fixes # x86 fixes
@ -2304,6 +2297,11 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Mon Jul 23 2018 Jiri Vanek <jvanek@redhat.com> - 11:1.8.0.181-7.b13
- updated to u181
- patches aligned according to rhel7 (full credit to gnu_andrew)
- removed upstreamed patch104 pr3458-rh1540242-aarch64.patch
* Tue Jul 17 2018 Jiri Vanek <jvanek@redhat.com> - 11:1.8.0.172-16.b11 * Tue Jul 17 2018 Jiri Vanek <jvanek@redhat.com> - 11:1.8.0.172-16.b11
- added Recommends gtk2 for main package - added Recommends gtk2 for main package
- added Suggests lksctp-tools, pcsc-lite-devel, cups for headless package - added Suggests lksctp-tools, pcsc-lite-devel, cups for headless package

View File

@ -1,11 +0,0 @@
diff --git a/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
--- openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
@@ -698,6 +698,7 @@
extern "C" {
int SpinPause() {
+ return 0;
}
void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {