diff options
| author | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 09:00:08 +0200 |
|---|---|---|
| committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 15:11:36 +0200 |
| commit | e5510ba991a5494e562776f135fc07f2999a86a8 (patch) | |
| tree | 48c5fb5d665af845c4dfd92861dc99aa88b71347 /recipes-core/openjdk/patches-openjdk-8/1402-hotspot-aarch64-remaining-musl-fixes.patch | |
| parent | a599da830cdfe8f50534a8b5d4b8b963b34bc045 (diff) | |
| download | meta-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/1402-hotspot-aarch64-remaining-musl-fixes.patch')
| -rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/1402-hotspot-aarch64-remaining-musl-fixes.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1402-hotspot-aarch64-remaining-musl-fixes.patch b/recipes-core/openjdk/patches-openjdk-8/1402-hotspot-aarch64-remaining-musl-fixes.patch new file mode 100644 index 0000000..2aafd82 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1402-hotspot-aarch64-remaining-musl-fixes.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From 033183cd3598ff8ba4a40ef529dfad89c6226ca6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
| 3 | Date: Tue, 27 Feb 2018 15:33:17 +0000 | ||
| 4 | Subject: [PATCH 1402/1402] hotspot/aarch64: remaining musl fixes | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | * fpu_control.h doesn't exist in musl | ||
| 10 | | hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp:78:11: fatal error: fpu_control.h: No such file or directory | ||
| 11 | | # include <fpu_control.h> | ||
| 12 | | ^~~~~~~~~~~~~~~ | ||
| 13 | |||
| 14 | Upstream-Status: Inappropriate [OE specific] | ||
| 15 | |||
| 16 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
| 17 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
| 18 | --- | ||
| 19 | src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 2 +- | ||
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 21 | |||
| 22 | 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 | ||
| 23 | index 27dcbfa97..33779ae57 100644 | ||
| 24 | --- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | ||
| 25 | +++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | ||
| 26 | @@ -72,7 +72,7 @@ | ||
| 27 | # include <pwd.h> | ||
| 28 | # include <poll.h> | ||
| 29 | # include <ucontext.h> | ||
| 30 | -# include <fpu_control.h> | ||
| 31 | +# include <linux/types.h> /* provides __u64 */ | ||
| 32 | |||
| 33 | #define REG_FP 29 | ||
| 34 | |||
| 35 | -- | ||
| 36 | 2.26.2 | ||
| 37 | |||
