summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.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/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.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/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch
new file mode 100644
index 0000000..b36dc37
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch
@@ -0,0 +1,59 @@
1From de5bf18a604e8213fe5a6510a37783c134af90c6 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:40:34 +0100
4Subject: [PATCH 1004/1013] hotspot: fix -Wreturn-type issues introduced by
5 8061651
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10|# HG changeset patch
11|# User andrew
12|# Date 1529475043 -3600
13|# Wed Jun 20 07:10:43 2018 +0100
14|# Node ID f6341f4635dacb56678264d29a88cd052b74036b
15|# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
16PR3601: Fix additional -Wreturn-type issues introduced by 8061651
17
18Upstream-Status: Backport
19
20Signed-off-by: André Draszik <andre.draszik@jci.com>
21Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
22---
23 src/share/vm/prims/jvm.cpp | 6 +++---
24 1 file changed, 3 insertions(+), 3 deletions(-)
25
26diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp
27index bc3ff540d..29532ab11 100644
28--- a/hotspot/src/share/vm/prims/jvm.cpp
29+++ b/hotspot/src/share/vm/prims/jvm.cpp
30@@ -918,7 +918,7 @@ JVM_END
31 JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
32 JVMWrapper("JVM_KnownToNotExist");
33 #if INCLUDE_CDS
34- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
35+ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
36 #else
37 return false;
38 #endif
39@@ -928,7 +928,7 @@ JVM_END
40 JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
41 JVMWrapper("JVM_GetResourceLookupCacheURLs");
42 #if INCLUDE_CDS
43- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
44+ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
45 #else
46 return NULL;
47 #endif
48@@ -938,7 +938,7 @@ JVM_END
49 JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
50 JVMWrapper("JVM_GetResourceLookupCache");
51 #if INCLUDE_CDS
52- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
53+ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
54 #else
55 return NULL;
56 #endif
57--
582.26.2
59