diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 12:41:58 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-24 08:19:14 +0200 |
commit | 3b65eea96eddde97169ca5e00be01a9dbd257786 (patch) | |
tree | 9e6ec626f6e96141ad015ecdfa5d38453160f70e /recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch | |
parent | 00cb61feb07098d55b78237af6eb55fc4b906a0e (diff) | |
download | meta-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/1201-hotspot-aarch32-fix-missing-return-values.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch b/recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch new file mode 100644 index 0000000..d4294d2 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From f4d687a4d6ddb08cae3bcce46257ea57544294c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Thu, 16 Aug 2018 02:27:44 +0100 | ||
4 | Subject: [PATCH 1201/1202] hotspot/aarch32: fix missing return values | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
11 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
12 | --- | ||
13 | src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | 3 +++ | ||
14 | src/cpu/aarch32/vm/relocInfo_aarch32.cpp | 1 + | ||
15 | 2 files changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | ||
18 | index 8aae15af2..76b6f1fe9 100644 | ||
19 | --- a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | ||
20 | +++ b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | ||
21 | @@ -158,16 +158,19 @@ static Register as_reg(LIR_Opr op) { | ||
22 | Address LIR_Assembler::as_Address(LIR_Address* addr) { | ||
23 | // as_Address(LIR_Address*, Address::InsnDataType) should be used instead | ||
24 | ShouldNotCallThis(); | ||
25 | + return Address(); | ||
26 | } | ||
27 | |||
28 | Address LIR_Assembler::as_Address_hi(LIR_Address* addr) { | ||
29 | // as_Address_hi(LIR_Address*, Address::InsnDataType) should be used instead | ||
30 | ShouldNotCallThis(); | ||
31 | + return Address(); | ||
32 | } | ||
33 | |||
34 | Address LIR_Assembler::as_Address_lo(LIR_Address* addr) { | ||
35 | // as_Address_lo(LIR_Address*, Address::InsnDataType) should be used instead | ||
36 | ShouldNotCallThis(); | ||
37 | + return Address(); | ||
38 | } | ||
39 | |||
40 | Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp, Address::InsnDataType type) { | ||
41 | diff --git a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp | ||
42 | index 979d53c98..c0b1a4c7a 100644 | ||
43 | --- a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp | ||
44 | +++ b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp | ||
45 | @@ -87,6 +87,7 @@ address Relocation::pd_call_destination(address orig_addr) { | ||
46 | } | ||
47 | |||
48 | ShouldNotReachHere(); | ||
49 | + return NULL; | ||
50 | } | ||
51 | |||
52 | void Relocation::pd_set_call_destination(address x) { | ||
53 | -- | ||
54 | 2.26.2 | ||
55 | |||