diff options
author | André Draszik <andre.draszik@jci.com> | 2018-08-14 13:50:58 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2018-08-14 16:41:47 +0200 |
commit | e89564dc67cf0136d998a73813c74d9e174f30af (patch) | |
tree | b6b8b90360be488da280b06833c604858fea8c6a /recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch | |
parent | cd17a0f9389594d931d859472c18d166d4996df1 (diff) | |
download | meta-java-e89564dc67cf0136d998a73813c74d9e174f30af.tar.gz |
openjdk-8: gcc-8 fix #4: undefined behaviour (hotspot)
Using gcc-8, Hotspot is being miscompiled, resulting in non-
working binaries.
The reason is undefined behaviour, which gcc-8 even warns about
and errors out. We have so far have taped over those warnings,
but it turns out that we simply cannot do that.
Add patches to address undefined behaviour causing miscompilation
of hotsport.
This also means we can remove the -Wno-error=return-type C compiler
flag again which was recently added in error in
commit 52fb41cec7d5 ("openjdk-8: fix build for gcc8.x") only hiding
the compiler warnings/errors that were flagging the incorrect code
in the first place.
With these patches applied, the openjdk-8 ARM port works again:
| RESULTS:
| RESULTS - ping.PingTest.test_ping - Testcase 964: PASSED (0.04s)
| RESULTS - ssh.SSHTest.test_ssh - Testcase 224: PASSED (0.68s)
| RESULTS - java.JavaTest.test_java_exists - Testcase -1: PASSED (0.14s)
| RESULTS - java.JavaTest.test_java_jar_comp_mode - Testcase -1: FAILED (5.13s)
| RESULTS - java.JavaTest.test_java_jar_int_mode - Testcase -1: PASSED (4.48s)
| RESULTS - java.JavaTest.test_java_jar_works - Testcase -1: PASSED (4.44s)
| RESULTS - java.JavaTest.test_java_version - Testcase -1: PASSED (3.66s)
| RESULTS - javac.JavacTest.test_javac_exists - Testcase -1: PASSED (0.13s)
| RESULTS - javac.JavacTest.test_javac_works - Testcase -1: PASSED (30.87s)
| SUMMARY:
| openjdk-8-test-image () - Ran 9 tests in 50.263s
The java.JavaTest.test_java_jar_comp_mode failure can be ignored for now,
as that test verifies compiled mode which is not available on arm. The
testcase must be fixed instead.
(We need to refresh one unrelated existing patch to avoid patch fuzz warnings)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch b/recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch new file mode 100644 index 0000000..e11c19c --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 1fa1097d45afa2fe2bfd989fbd90578f5c5fc540 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 12:14:21 +0100 | ||
4 | Subject: [PATCH] hotspot/aarch64: fix undefined behaviour (gcc v8 fix) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Backport patch from | ||
10 | http://hg.openjdk.java.net/aarch64-port/jdk8u/hotspot/rev/253b0c304db6 | ||
11 | to address segfaults due to undefined behaviour. | ||
12 | |||
13 | |# HG changeset patch | ||
14 | |# User shade | ||
15 | |# Date 1526068247 -7200 | ||
16 | |# Node ID 253b0c304db6d31be3d3d7cf7cf1b3561a16dc3a | ||
17 | |# Parent 1ced2ae00e35e6f855175fc44500b37fbac9e314 | ||
18 | UB in os_linux_aarch64.cpp SpinPause | ||
19 | Reviewed-by: aph, shade, adinn | ||
20 | |||
21 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
22 | Upstream-Status: Backport [http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916] | ||
23 | --- | ||
24 | hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 1 + | ||
25 | 1 file changed, 1 insertion(+) | ||
26 | |||
27 | diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | ||
28 | index 8b985693..f536817e 100644 | ||
29 | --- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | ||
30 | +++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | ||
31 | @@ -699,6 +699,7 @@ void os::verify_stack_alignment() { | ||
32 | |||
33 | extern "C" { | ||
34 | int SpinPause() { | ||
35 | + return 0; | ||
36 | } | ||
37 | |||
38 | void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) { | ||
39 | -- | ||
40 | 2.18.0 | ||
41 | |||