rpms
/
java-9-openjdk
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the failing patch again 

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
David Abdurachmanov 2018-09-19 15:35:04 +03:00
parent f7624ef09f
commit 4e460c0425
Signed by: davidlt
GPG Key ID: 7108702C938B13C1
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java-9-openjdk.spec
View File

@ -856,7 +856,7 @@ Provides: java-%{javaver}-%{origin}-accessiblity = %{epoch}:%{version}-%{release
Name: java-%{majorver}-%{origin}
Version: %{newjavaver}.%{buildver}
Release: 6.1.riscv64%{?dist}
Release: 6.2.riscv64%{?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
@ -1855,7 +1855,7 @@ require "copy_jdk_configs.lua"
%changelog
* Wed Sep 19 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:9.0.4.11-6.1.riscv64
* Wed Sep 19 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:9.0.4.11-6.2.riscv64
- Fix compilation error (ppc_stack_overflow_fix.patch)
* Wed Sep 19 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:9.0.4.11-6.0.riscv64

32
ppc_stack_overflow_fix.patch
View File

@ -1,7 +1,8 @@
diff --git a/src/cpu/zero/vm/stack_zero.hpp b/src/cpu/zero/vm/stack_zero.hpp
--- jdk9/hotspot/src/cpu/zero/vm/stack_zero.hpp
+++ jdk9/hotspot/src/cpu/zero/vm/stack_zero.hpp
@@ -99,7 +99,7 @@
diff --git a/openjdk/hotspot/src/cpu/zero/vm/stack_zero.hpp b/openjdk/hotspot/src/cpu/zero/vm/stack_zero.hpp
index 6048cf2ac..9bbce8a7b 100644
--- a/openjdk/hotspot/src/cpu/zero/vm/stack_zero.hpp
+++ b/openjdk/hotspot/src/cpu/zero/vm/stack_zero.hpp
@@ -96,7 +96,7 @@ class ZeroStack {
int shadow_pages_size() const {
return _shadow_pages_size;
}
@ -10,10 +11,11 @@ diff --git a/src/cpu/zero/vm/stack_zero.hpp b/src/cpu/zero/vm/stack_zero.hpp
public:
void overflow_check(int required_words, TRAPS);
diff --git a/src/cpu/zero/vm/stack_zero.inline.hpp b/src/cpu/zero/vm/stack_zero.inline.hpp
--- jdk9/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp
+++ jdk9/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp
@@ -47,12 +47,12 @@
diff --git a/openjdk/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp b/openjdk/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp
index 02d12e8e9..011f3c701 100644
--- a/openjdk/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp
+++ b/openjdk/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp
@@ -47,11 +47,11 @@ inline void ZeroStack::overflow_check(int required_words, TRAPS) {
// This method returns the amount of ABI stack available for us
// to use under normal circumstances. Note that the returned
// value can be negative.
@ -28,11 +30,11 @@ diff --git a/src/cpu/zero/vm/stack_zero.inline.hpp b/src/cpu/zero/vm/stack_zero.
return stack_free;
}
#endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
--- jdk9/hotspot/src/os/posix/vm/os_posix.cpp
+++ jdk9/hotspot/src/os/posix/vm/os_posix.cpp
@@ -4791,6 +4791,13 @@
diff --git a/openjdk/hotspot/src/os/posix/vm/os_posix.cpp b/openjdk/hotspot/src/os/posix/vm/os_posix.cpp
index 5885906f6..d175f6be9 100644
--- a/openjdk/hotspot/src/os/posix/vm/os_posix.cpp
+++ b/openjdk/hotspot/src/os/posix/vm/os_posix.cpp
@@ -1121,6 +1121,13 @@ jint os::Posix::set_minimum_stack_sizes() {
JavaThread::stack_shadow_zone_size();
_java_thread_min_stack_allowed = align_size_up(_java_thread_min_stack_allowed, vm_page_size());
@ -40,8 +42,8 @@ diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
+ // If this is Zero, allow at the very minimum one page each for the
+ // Zero stack and the native stack. This won't make any difference
+ // for 4k pages, but is significant for large pages.
+ _java_thread_min_stack_allowed = MAX2(_java_thread_min_stack_allowed,
+ align_size_up((size_t)(JavaThread::stack_guard_zone_size()+JavaThread::stack_shadow_zone_size()+2) * vm_page_size(), vm_page_size()));
+ size_t _zero_min_stack_allowed = align_size_up((size_t)(JavaThread::stack_guard_zone_size()+JavaThread::stack_shadow_zone_size()+2) * vm_page_size(), vm_page_size());
+ _java_thread_min_stack_allowed = MAX2(_java_thread_min_stack_allowed, _zero_min_stack_allowed);
+#endif
size_t stack_size_in_bytes = ThreadStackSize * K;