summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-08-20 12:41:58 +0200
committerRichard Leitner <richard.leitner@skidata.com>2020-08-24 08:19:14 +0200
commit3b65eea96eddde97169ca5e00be01a9dbd257786 (patch)
tree9e6ec626f6e96141ad015ecdfa5d38453160f70e /recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
parent00cb61feb07098d55b78237af6eb55fc4b906a0e (diff)
downloadmeta-java-3b65eea96eddde97169ca5e00be01a9dbd257786.tar.gz
openjdk-8: update to latest ga version 265
Patch related changes: * The hotspot patch 1004 was mainlined in changeset 3a3803a0c789 [1] and is therfore dropped. * The jdk patch 2010 was mainlined in changeset c4418d567028 [2] and is therefore dropped. * Rename hotspot/aarch64 patches to start with number 1401. * Rename hotspot/aarch32 patches to start with number 1201. * Merge aarch32-hotspot-fix-shark-build-pt2.patch and openjdk8-fix-shark-build-pt2.patch to hotspot patch 1013 as they were the same. [1] https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/3a3803a0c789 [2] https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/c4418d567028 Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
index 2393869..760c9e4 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
@@ -1,4 +1,4 @@
1From d01c03bb68692365f1cf8c8e79c42b7452b83928 Mon Sep 17 00:00:00 2001 1From ca63ab55217cbef6aea495139f766922c61e50b2 Mon Sep 17 00:00:00 2001
2From: Wenlin Kang <wenlin.kang@windriver.com> 2From: Wenlin Kang <wenlin.kang@windriver.com>
3Date: Sun, 17 Feb 2019 22:38:33 -0800 3Date: Sun, 17 Feb 2019 22:38:33 -0800
4Subject: [PATCH 1001/1013] hotspot: fix crash on JNI_CreateJavaVM 4Subject: [PATCH 1001/1013] hotspot: fix crash on JNI_CreateJavaVM
@@ -19,10 +19,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
19 1 file changed, 2 insertions(+), 1 deletion(-) 19 1 file changed, 2 insertions(+), 1 deletion(-)
20 20
21diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp 21diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
22index 03cabfefb..4f28cc1fb 100644 22index c477851c1..47eef1e7c 100644
23--- a/hotspot/src/os/linux/vm/os_linux.cpp 23--- a/hotspot/src/os/linux/vm/os_linux.cpp
24+++ b/hotspot/src/os/linux/vm/os_linux.cpp 24+++ b/hotspot/src/os/linux/vm/os_linux.cpp
25@@ -3192,7 +3192,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) { 25@@ -3227,7 +3227,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
26 uintptr_t stack_extent = (uintptr_t) os::Linux::initial_thread_stack_bottom(); 26 uintptr_t stack_extent = (uintptr_t) os::Linux::initial_thread_stack_bottom();
27 unsigned char vec[1]; 27 unsigned char vec[1];
28 28