summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-12-30 15:35:59 +0100
committerRichard Leitner <richard.leitner@skidata.com>2020-01-28 15:09:31 +0100
commit7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch)
tree398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch
parent19b569281cc30e3aa94e772d6885cd340b1d1724 (diff)
downloadmeta-java-7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14.tar.gz
openjdk-8: update to latest ga version 242
As OpenJDK-8 is now tagging "ga" versions in addition to the "build" version the recipes are adapted to use those "ga" versions. All existing patches got re-applied and renamed. For better handling Hotspot patches now start at patch number 1001 and jdk patches at 2001. Furthermore architecture dependent patches are prefixed with the architecture they apply on. Following patches/hunks were completely dropped: - 0002-hotspot-fix-compilation-with-security-flags-enabled.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185 - 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch ostream.cpp:112 got fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502 - 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 - 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd - 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c - openjdk8-add-missing-linker-flags.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a - openjdk8-fix-shark-stdc++11.patch fixed in hotspot jdk8u - openjdk8-fix-libpng-neon-build.patch fixed in jdk https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1 - aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u Following patches were newly added: - 0011-autoconf-fix-CC-with-arguments-detection.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" - 0012-autoconf-NativeCompilation-remove-sysroot.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" Additionally add UPDATING.md which describes the openjdk8 update process for this layer and update8checksums.sh, a script that updates the openjdk8 source archive checksums in the corresponding .inc files. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch
new file mode 100644
index 0000000..bedc448
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch
@@ -0,0 +1,53 @@
1From 658adc5b6567e9a6df56beabb8d226a9b4d8e762 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] hotspot/aarch32: fix missing return values
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Signed-off-by: André Draszik <andre.draszik@jci.com>
10---
11 hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | 3 +++
12 hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp | 1 +
13 2 files changed, 4 insertions(+)
14
15diff --git a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp
16index cd291bf2..4ba98c68 100644
17--- a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp
18+++ b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp
19@@ -158,16 +158,19 @@ static Register as_reg(LIR_Opr op) {
20 Address LIR_Assembler::as_Address(LIR_Address* addr) {
21 // as_Address(LIR_Address*, Address::InsnDataType) should be used instead
22 ShouldNotCallThis();
23+ return Address();
24 }
25
26 Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
27 // as_Address_hi(LIR_Address*, Address::InsnDataType) should be used instead
28 ShouldNotCallThis();
29+ return Address();
30 }
31
32 Address LIR_Assembler::as_Address_lo(LIR_Address* addr) {
33 // as_Address_lo(LIR_Address*, Address::InsnDataType) should be used instead
34 ShouldNotCallThis();
35+ return Address();
36 }
37
38 Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp, Address::InsnDataType type) {
39diff --git a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp
40index 979d53c9..c0b1a4c7 100644
41--- a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp
42+++ b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp
43@@ -87,6 +87,7 @@ address Relocation::pd_call_destination(address orig_addr) {
44 }
45
46 ShouldNotReachHere();
47+ return NULL;
48 }
49
50 void Relocation::pd_set_call_destination(address x) {
51--
522.18.0
53