summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-08-20 09:00:08 +0200
committerRichard Leitner <richard.leitner@skidata.com>2020-08-20 15:11:36 +0200
commite5510ba991a5494e562776f135fc07f2999a86a8 (patch)
tree48c5fb5d665af845c4dfd92861dc99aa88b71347 /recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch
parenta599da830cdfe8f50534a8b5d4b8b963b34bc045 (diff)
downloadmeta-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/1201-hotspot-aarch32-fix-missing-return-values.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1201-hotspot-aarch32-fix-missing-return-values.patch55
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 @@
1From f4d687a4d6ddb08cae3bcce46257ea57544294c0 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Thu, 16 Aug 2018 02:27:44 +0100
4Subject: [PATCH 1201/1202] hotspot/aarch32: fix missing return values
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Pending
10Signed-off-by: André Draszik <andre.draszik@jci.com>
11Signed-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
17diff --git a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp
18index 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) {
41diff --git a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp
42index 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--
542.26.2
55