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/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.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/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch b/recipes-core/openjdk/patches-openjdk-8/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch new file mode 100644 index 0000000..e4aa48f --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 2e611155c42352c1a0c15078681c6712711f6c01 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Mon, 13 Aug 2018 17:03:56 +0100 | ||
4 | Subject: [PATCH 1401/1402] hotspot/aarch64: Add missing return value to | ||
5 | LIR_Assembler::as_Address | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | |# HG changeset patch | ||
11 | |# User andrew | ||
12 | |# Date 1518669922 0 | ||
13 | |# Thu Feb 15 04:45:22 2018 +0000 | ||
14 | |# Node ID adaf109718c10888cce5b6e73af7f3e15a7ab0db | ||
15 | |# Parent 3ade0115344b77e6d00462044e0cf68722685bfe | ||
16 | PR3519: Fix further functions with a missing return value. | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | |||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
22 | --- | ||
23 | src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 1 + | ||
24 | 1 file changed, 1 insertion(+) | ||
25 | |||
26 | diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | ||
27 | index 7b85119c3..074e71a7d 100644 | ||
28 | --- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | ||
29 | +++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | ||
30 | @@ -207,6 +207,7 @@ Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp) { | ||
31 | return Address(base, tmp, Address::lsl(addr->scale())); | ||
32 | } | ||
33 | } | ||
34 | + return Address(); | ||
35 | } | ||
36 | |||
37 | Address LIR_Assembler::as_Address_hi(LIR_Address* addr) { | ||
38 | -- | ||
39 | 2.26.2 | ||
40 | |||