summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.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/1007-hotspot-Missing-return-statement-in-__sync_val_compa.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/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch
deleted file mode 100644
index 79e3b7a..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 8f0a48544832278f9b6503dae1a03b05da41b8fc 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:46:33 +0100
4Subject: [PATCH 1007/1013] hotspot: Missing return statement in
5 __sync_val_compare_and_swap_8
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 1518667645 0
13|# Thu Feb 15 04:07:25 2018 +0000
14|# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
15|# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
168197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
17Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
18Reviewed-by: aph
19
20Upstream-Status: Backport
21
22Signed-off-by: André Draszik <andre.draszik@jci.com>
23Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
24---
25 src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 +
26 src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 +
27 2 files changed, 2 insertions(+)
28
29diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
30index c857b5526..4aaf78b1d 100644
31--- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
32+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
33@@ -457,6 +457,7 @@ extern "C" {
34 long long unsigned int oldval,
35 long long unsigned int newval) {
36 ShouldNotCallThis();
37+ return 0;
38 }
39 };
40 #endif // !_LP64
41diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
42index cbee43baa..136d4d3de 100644
43--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
44+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
45@@ -498,6 +498,7 @@ extern "C" {
46 long long unsigned int oldval,
47 long long unsigned int newval) {
48 ShouldNotCallThis();
49+ return 0;
50 }
51 };
52 #endif // !_LP64
53--
542.26.2
55