diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 09:00:08 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 15:11:36 +0200 |
commit | e5510ba991a5494e562776f135fc07f2999a86a8 (patch) | |
tree | 48c5fb5d665af845c4dfd92861dc99aa88b71347 /recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch | |
parent | a599da830cdfe8f50534a8b5d4b8b963b34bc045 (diff) | |
download | meta-java-e5510ba991a5494e562776f135fc07f2999a86a8.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/2001-jdk-comparison-between-pointer-and-integer.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch index 38d3019..ce4b385 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 46ea1c28b53bf5fd2be03fa1d78936f6a1e70fc4 Mon Sep 17 00:00:00 2001 | 1 | From d2942510d891c58bd095a57bdd903145d3d95955 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 11:13:08 +0000 | 3 | Date: Fri, 2 Mar 2018 11:13:08 +0000 |
4 | Subject: [PATCH 2001/2008] jdk: comparison between pointer and integer | 4 | Subject: [PATCH 2001/2009] jdk: comparison between pointer and integer |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -28,7 +28,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | |||
28 | 3 files changed, 13 insertions(+), 14 deletions(-) | 28 | 3 files changed, 13 insertions(+), 14 deletions(-) |
29 | 29 | ||
30 | diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c | 30 | diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c |
31 | index b1b8223a6..2eee6261a 100644 | 31 | index b1b8223a63..2eee6261ac 100644 |
32 | --- a/jdk/src/share/native/java/net/net_util.c | 32 | --- a/jdk/src/share/native/java/net/net_util.c |
33 | +++ b/jdk/src/share/native/java/net/net_util.c | 33 | +++ b/jdk/src/share/native/java/net/net_util.c |
34 | @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { | 34 | @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { |
@@ -99,7 +99,7 @@ index b1b8223a6..2eee6261a 100644 | |||
99 | int scope; | 99 | int scope; |
100 | 100 | ||
101 | diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h | 101 | diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h |
102 | index c8a5e68c4..176ca586e 100644 | 102 | index c8a5e68c49..176ca586ee 100644 |
103 | --- a/jdk/src/share/native/java/net/net_util.h | 103 | --- a/jdk/src/share/native/java/net/net_util.h |
104 | +++ b/jdk/src/share/native/java/net/net_util.h | 104 | +++ b/jdk/src/share/native/java/net/net_util.h |
105 | @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); | 105 | @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); |
@@ -120,7 +120,7 @@ index c8a5e68c4..176ca586e 100644 | |||
120 | extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); | 120 | extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); |
121 | extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); | 121 | extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); |
122 | diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 122 | diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
123 | index 0a51a365f..dcc348cf1 100644 | 123 | index 0a51a365fd..dcc348cf1f 100644 |
124 | --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 124 | --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
125 | +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 125 | +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
126 | @@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, | 126 | @@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, |
@@ -142,5 +142,5 @@ index 0a51a365f..dcc348cf1 100644 | |||
142 | goto cleanupAndReturn; | 142 | goto cleanupAndReturn; |
143 | } | 143 | } |
144 | -- | 144 | -- |
145 | 2.24.1 | 145 | 2.26.2 |
146 | 146 | ||