diff options
author | André Draszik <andre.draszik@jci.com> | 2018-08-22 13:01:42 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2018-10-02 07:58:49 +0200 |
commit | 75c2622906afba5a53d48fde72dbdef8d81ba05a (patch) | |
tree | 72bea95af9d0ba2900c3f5b18d1e98dcee9a852e /recipes-core/openjdk/patches-openjdk-8 | |
parent | d17c8e8a404c749d3a8c7b72bb8fc7a18cedd0b6 (diff) | |
download | meta-java-75c2622906afba5a53d48fde72dbdef8d81ba05a.tar.gz |
openjdk-8: add aarch32 port 8u172b11
Similar to the aarch64 build, we import the specific aarch32 port when
building for ARMv7. We also add all the necessary patches to:
* compile using gcc v8
* compile against musl
This was tested on:
* QEMU with cortex A7 emulation (using glibc)
* real hardware (using musl)
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')
11 files changed, 316 insertions, 91 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-aarch32-fix-missing-return-values.patch b/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-aarch32-fix-missing-return-values.patch new file mode 100644 index 0000000..bedc448 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-aarch32-fix-missing-return-values.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From 658adc5b6567e9a6df56beabb8d226a9b4d8e762 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Thu, 16 Aug 2018 02:27:44 +0100 | ||
4 | Subject: [PATCH] hotspot/aarch32: fix missing return values | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Signed-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 | |||
15 | diff --git a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | ||
16 | index 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) { | ||
39 | diff --git a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp | ||
40 | index 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 | -- | ||
52 | 2.18.0 | ||
53 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch32.patch b/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch32.patch new file mode 100644 index 0000000..1140887 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch32.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 4bab4a4468a59e303e8d05a409a07a24c2342452 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Mon, 20 Aug 2018 12:38:38 +0100 | ||
4 | Subject: [PATCH] hotspot: remaining musl fixes (aarch32) | ||
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_aarch32/vm/os_linux_aarch32.cpp:78:11: fatal error: fpu_control.h: No such file or directory | ||
11 | | # include <fpu_control.h> | ||
12 | | ^~~~~~~~~~~~~~~ | ||
13 | | compilation terminated. | ||
14 | |||
15 | Upstream-Status: Inappropriate [OE specific] | ||
16 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
17 | --- | ||
18 | hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp | 1 - | ||
19 | 1 file changed, 1 deletion(-) | ||
20 | |||
21 | diff --git a/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp b/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp | ||
22 | index 052a423c..93a315e4 100644 | ||
23 | --- a/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp | ||
24 | +++ b/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp | ||
25 | @@ -75,7 +75,6 @@ | ||
26 | # include <pwd.h> | ||
27 | # include <poll.h> | ||
28 | # include <ucontext.h> | ||
29 | -# include <fpu_control.h> | ||
30 | |||
31 | #define REG_FP 29 | ||
32 | #define SPELL_REG_SP "sp" | ||
33 | -- | ||
34 | 2.11.0 | ||
35 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-common.patch index 24342b5..9126495 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-common.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 19b1d6b4dc64a1c44a8f90776a489eee5c76463d Mon Sep 17 00:00:00 2001 | 1 | From 19b1d6b4dc64a1c44a8f90776a489eee5c76463d Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 15:12:08 +0000 | 3 | Date: Tue, 27 Feb 2018 15:12:08 +0000 |
4 | Subject: [PATCH 5/9] hotspot: disable agent build | 4 | Subject: [PATCH] hotspot: disable agent build (common) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -11,25 +11,10 @@ the agent needs thread_db, which doesn't exist in musl | |||
11 | Upstream-Status: Inappropriate [musl specific] | 11 | Upstream-Status: Inappropriate [musl specific] |
12 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 12 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
13 | --- | 13 | --- |
14 | common/autoconf/jdk-options.m4 | 2 +- | 14 | hotspot/make/linux/makefiles/defs.make | 4 ++++ |
15 | hotspot/make/linux/makefiles/defs.make | 4 ++++ | 15 | hotspot/make/linux/makefiles/sa.make | 2 +- |
16 | hotspot/make/linux/makefiles/sa.make | 2 +- | 16 | 2 files changed, 5 insertions(+), 1 deletion(-) |
17 | hotspot/make/linux/makefiles/saproc.make | 2 ++ | ||
18 | 4 files changed, 8 insertions(+), 2 deletions(-) | ||
19 | 17 | ||
20 | diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 | ||
21 | index a8f71705..036963ac 100644 | ||
22 | --- a/common/autoconf/jdk-options.m4 | ||
23 | +++ b/common/autoconf/jdk-options.m4 | ||
24 | @@ -151,7 +151,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS], | ||
25 | AC_SUBST(JVM_VARIANT_ZEROSHARK) | ||
26 | AC_SUBST(JVM_VARIANT_CORE) | ||
27 | |||
28 | - INCLUDE_SA=true | ||
29 | + INCLUDE_SA=false | ||
30 | if test "x$JVM_VARIANT_ZERO" = xtrue ; then | ||
31 | INCLUDE_SA=false | ||
32 | fi | ||
33 | diff --git a/hotspot/make/linux/makefiles/defs.make b/hotspot/make/linux/makefiles/defs.make | 18 | diff --git a/hotspot/make/linux/makefiles/defs.make b/hotspot/make/linux/makefiles/defs.make |
34 | index 3af5878a..d10bab95 100644 | 19 | index 3af5878a..d10bab95 100644 |
35 | --- a/hotspot/make/linux/makefiles/defs.make | 20 | --- a/hotspot/make/linux/makefiles/defs.make |
@@ -65,24 +50,6 @@ index 66a7b945..61cc7244 100644 | |||
65 | $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ | 50 | $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ |
66 | fi | 51 | fi |
67 | 52 | ||
68 | diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make | ||
69 | index 6579c8e1..8f29004c 100644 | ||
70 | --- a/hotspot/make/linux/makefiles/saproc.make | ||
71 | +++ b/hotspot/make/linux/makefiles/saproc.make | ||
72 | @@ -62,11 +62,13 @@ endif | ||
73 | # if $(AGENT_DIR) does not exist, we don't build SA | ||
74 | # also, we don't build SA on Itanium or zero. | ||
75 | |||
76 | +ifeq (0,1) | ||
77 | ifneq ($(wildcard $(AGENT_DIR)),) | ||
78 | ifneq ($(filter-out ia64 zero,$(SRCARCH)),) | ||
79 | BUILDLIBSAPROC = $(LIBSAPROC) | ||
80 | endif | ||
81 | endif | ||
82 | +endif | ||
83 | |||
84 | ifneq ($(ALT_SASRCDIR),) | ||
85 | ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR | ||
86 | -- | 53 | -- |
87 | 2.16.2 | 54 | 2.16.2 |
88 | 55 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch new file mode 100644 index 0000000..cb893e5 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 5fa42493fd2dafb3bf9cf5a8a2be57e743eeafb8 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Wed, 15 Aug 2018 13:50:04 +0100 | ||
4 | Subject: [PATCH] hotspot: disable agent build (pt2: aarch32) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | the agent needs thread_db, which doesn't exist in musl | ||
10 | |||
11 | Upstream-Status: Inappropriate [musl specific] | ||
12 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
13 | --- | ||
14 | common/autoconf/jdk-options.m4 | 2 +- | ||
15 | hotspot/make/linux/makefiles/saproc.make | 2 ++ | ||
16 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 | ||
19 | index 56fa4198..4675f0b5 100644 | ||
20 | --- a/common/autoconf/jdk-options.m4 | ||
21 | +++ b/common/autoconf/jdk-options.m4 | ||
22 | @@ -151,7 +151,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS], | ||
23 | AC_SUBST(JVM_VARIANT_ZEROSHARK) | ||
24 | AC_SUBST(JVM_VARIANT_CORE) | ||
25 | |||
26 | - INCLUDE_SA=true | ||
27 | + INCLUDE_SA=false | ||
28 | if test "x$JVM_VARIANT_ZERO" = xtrue; then | ||
29 | INCLUDE_SA=false | ||
30 | fi | ||
31 | diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make | ||
32 | index ea52011e..f87d2cdb 100644 | ||
33 | --- a/hotspot/make/linux/makefiles/saproc.make | ||
34 | +++ b/hotspot/make/linux/makefiles/saproc.make | ||
35 | @@ -62,11 +62,13 @@ endif | ||
36 | # if $(AGENT_DIR) does not exist, we don't build SA | ||
37 | # also, we don't build SA on Itanium or zero. | ||
38 | |||
39 | +ifeq (0,1) | ||
40 | ifneq ($(wildcard $(AGENT_DIR)),) | ||
41 | ifneq ($(filter-out aarch32 ia64 zero,$(SRCARCH)),) | ||
42 | BUILDLIBSAPROC = $(LIBSAPROC) | ||
43 | endif | ||
44 | endif | ||
45 | +endif | ||
46 | |||
47 | ifneq ($(ALT_SASRCDIR),) | ||
48 | ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR | ||
49 | -- | ||
50 | 2.18.0 | ||
51 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch new file mode 100644 index 0000000..4b0b0f0 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 19b1d6b4dc64a1c44a8f90776a489eee5c76463d 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:12:08 +0000 | ||
4 | Subject: [PATCH] hotspot: disable agent build (pt2) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | the agent needs thread_db, which doesn't exist in musl | ||
10 | |||
11 | Upstream-Status: Inappropriate [musl specific] | ||
12 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
13 | --- | ||
14 | common/autoconf/jdk-options.m4 | 2 +- | ||
15 | hotspot/make/linux/makefiles/saproc.make | 2 ++ | ||
16 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 | ||
19 | index a8f71705..036963ac 100644 | ||
20 | --- a/common/autoconf/jdk-options.m4 | ||
21 | +++ b/common/autoconf/jdk-options.m4 | ||
22 | @@ -151,7 +151,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS], | ||
23 | AC_SUBST(JVM_VARIANT_ZEROSHARK) | ||
24 | AC_SUBST(JVM_VARIANT_CORE) | ||
25 | |||
26 | - INCLUDE_SA=true | ||
27 | + INCLUDE_SA=false | ||
28 | if test "x$JVM_VARIANT_ZERO" = xtrue ; then | ||
29 | INCLUDE_SA=false | ||
30 | fi | ||
31 | diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make | ||
32 | index 6579c8e1..8f29004c 100644 | ||
33 | --- a/hotspot/make/linux/makefiles/saproc.make | ||
34 | +++ b/hotspot/make/linux/makefiles/saproc.make | ||
35 | @@ -62,11 +62,13 @@ endif | ||
36 | # if $(AGENT_DIR) does not exist, we don't build SA | ||
37 | # also, we don't build SA on Itanium or zero. | ||
38 | |||
39 | +ifeq (0,1) | ||
40 | ifneq ($(wildcard $(AGENT_DIR)),) | ||
41 | ifneq ($(filter-out ia64 zero,$(SRCARCH)),) | ||
42 | BUILDLIBSAPROC = $(LIBSAPROC) | ||
43 | endif | ||
44 | endif | ||
45 | +endif | ||
46 | |||
47 | ifneq ($(ALT_SASRCDIR),) | ||
48 | ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR | ||
49 | -- | ||
50 | 2.16.2 | ||
51 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch index 4abd558..74cd422 100644 --- a/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch | |||
@@ -1,16 +1,11 @@ | |||
1 | From a02a9fbc3f1fed181504bdb5b0a16863247f92fc Mon Sep 17 00:00:00 2001 | 1 | From a02a9fbc3f1fed181504bdb5b0a16863247f92fc Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 10:11:51 +0000 | 3 | Date: Fri, 2 Mar 2018 10:11:51 +0000 |
4 | Subject: [PATCH 6/9] hotspot: os_linux: remove glibc dependencies | 4 | Subject: [PATCH] hotspot: os_linux: remove glibc dependencies (common) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
8 | 8 | ||
9 | * gnu/libc-version.h doesn't exist in musl | ||
10 | | hotspot/src/os/linux/vm/os_linux.cpp:97:11: fatal error: gnu/libc-version.h: No such file or directory | ||
11 | | # include <gnu/libc-version.h> | ||
12 | | ^~~~~~~~~~~~~~~~~~~~ | ||
13 | |||
14 | * dlvsym() is a GNU extension and doesn't exist in musl | 9 | * dlvsym() is a GNU extension and doesn't exist in musl |
15 | | hotspot/src/os/linux/vm/os_linux.cpp:2846:13: error: 'dlvsym' was not declared in this scope | 10 | | hotspot/src/os/linux/vm/os_linux.cpp:2846:13: error: 'dlvsym' was not declared in this scope |
16 | | void *f = dlvsym(handle, name, "libnuma_1.1"); | 11 | | void *f = dlvsym(handle, name, "libnuma_1.1"); |
@@ -23,21 +18,13 @@ Content-Transfer-Encoding: 8bit | |||
23 | Upstream-Status: Inappropriate [musl specific] | 18 | Upstream-Status: Inappropriate [musl specific] |
24 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 19 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
25 | --- | 20 | --- |
26 | hotspot/src/os/linux/vm/os_linux.cpp | 12 +++++++++++- | 21 | hotspot/src/os/linux/vm/os_linux.cpp | 11 +++++++++++ |
27 | 1 file changed, 11 insertions(+), 1 deletion(-) | 22 | 1 file changed, 11 insertions(+) |
28 | 23 | ||
29 | diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp | 24 | diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp |
30 | index 044a70a6..3137796a 100644 | 25 | index 044a70a6..3137796a 100644 |
31 | --- a/hotspot/src/os/linux/vm/os_linux.cpp | 26 | --- a/hotspot/src/os/linux/vm/os_linux.cpp |
32 | +++ b/hotspot/src/os/linux/vm/os_linux.cpp | 27 | +++ b/hotspot/src/os/linux/vm/os_linux.cpp |
33 | @@ -94,7 +94,6 @@ | ||
34 | # include <string.h> | ||
35 | # include <syscall.h> | ||
36 | # include <sys/sysinfo.h> | ||
37 | -# include <gnu/libc-version.h> | ||
38 | # include <sys/ipc.h> | ||
39 | # include <sys/shm.h> | ||
40 | # include <link.h> | ||
41 | @@ -530,6 +529,13 @@ void os::Linux::hotspot_sigmask(Thread* thread) { | 28 | @@ -530,6 +529,13 @@ void os::Linux::hotspot_sigmask(Thread* thread) { |
42 | // detecting pthread library | 29 | // detecting pthread library |
43 | 30 | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch new file mode 100644 index 0000000..512af52 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 2915f7f56b99fa130942acb4289c9b5310075adc Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Fri, 2 Mar 2018 10:11:51 +0000 | ||
4 | Subject: [PATCH] hotspot: os_linux: remove glibc dependencies (pt2: aarch32) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | * gnu/libc-version.h doesn't exist in musl | ||
10 | | hotspot/src/os/linux/vm/os_linux.cpp:97:11: fatal error: gnu/libc-version.h: No such file or directory | ||
11 | | # include <gnu/libc-version.h> | ||
12 | | ^~~~~~~~~~~~~~~~~~~~ | ||
13 | |||
14 | Upstream-Status: Inappropriate [musl specific] | ||
15 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
16 | --- | ||
17 | hotspot/src/os/linux/vm/os_linux.cpp | 3 --- | ||
18 | 1 file changed, 3 deletions(-) | ||
19 | |||
20 | diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp | ||
21 | index 8656357d..555b3a15 100644 | ||
22 | --- a/hotspot/src/os/linux/vm/os_linux.cpp | ||
23 | +++ b/hotspot/src/os/linux/vm/os_linux.cpp | ||
24 | @@ -94,9 +94,6 @@ | ||
25 | # include <string.h> | ||
26 | # include <syscall.h> | ||
27 | # include <sys/sysinfo.h> | ||
28 | -#ifndef __UCLIBC__ | ||
29 | -# include <gnu/libc-version.h> | ||
30 | -#endif | ||
31 | # include <sys/ipc.h> | ||
32 | # include <sys/shm.h> | ||
33 | # include <link.h> | ||
34 | -- | ||
35 | 2.18.0 | ||
36 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch new file mode 100644 index 0000000..91a653c --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From a02a9fbc3f1fed181504bdb5b0a16863247f92fc Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Fri, 2 Mar 2018 10:11:51 +0000 | ||
4 | Subject: [PATCH] hotspot: os_linux: remove glibc dependencies (common) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | * gnu/libc-version.h doesn't exist in musl | ||
10 | | hotspot/src/os/linux/vm/os_linux.cpp:97:11: fatal error: gnu/libc-version.h: No such file or directory | ||
11 | | # include <gnu/libc-version.h> | ||
12 | | ^~~~~~~~~~~~~~~~~~~~ | ||
13 | |||
14 | Upstream-Status: Inappropriate [musl specific] | ||
15 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
16 | --- | ||
17 | hotspot/src/os/linux/vm/os_linux.cpp | 1 - | ||
18 | 1 file changed, 1 deletion(-) | ||
19 | |||
20 | diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp | ||
21 | index 044a70a6..3137796a 100644 | ||
22 | --- a/hotspot/src/os/linux/vm/os_linux.cpp | ||
23 | +++ b/hotspot/src/os/linux/vm/os_linux.cpp | ||
24 | @@ -94,7 +94,6 @@ | ||
25 | # include <string.h> | ||
26 | # include <syscall.h> | ||
27 | # include <sys/sysinfo.h> | ||
28 | -# include <gnu/libc-version.h> | ||
29 | # include <sys/ipc.h> | ||
30 | # include <sys/shm.h> | ||
31 | # include <link.h> | ||
32 | -- | ||
33 | 2.16.2 | ||
34 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-common.patch index f241361..ece7f14 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build.patch +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-common.patch | |||
@@ -92,19 +92,6 @@ | |||
92 | _thread->metadata_handles()->push((Metadata*)_value); \ | 92 | _thread->metadata_handles()->push((Metadata*)_value); \ |
93 | } else { \ | 93 | } else { \ |
94 | _thread = NULL; \ | 94 | _thread = NULL; \ |
95 | --- hotspot/src/cpu/zero/vm/entry_zero.hpp.orig | ||
96 | +++ hotspot/src/cpu/zero/vm/entry_zero.hpp | ||
97 | @@ -26,6 +26,10 @@ | ||
98 | #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP | ||
99 | #define CPU_ZERO_VM_ENTRY_ZERO_HPP | ||
100 | |||
101 | +#include "utilities/globalDefinitions.hpp" | ||
102 | +#include "utilities/exceptions.hpp" | ||
103 | +#include "interpreter/cppInterpreter.hpp" | ||
104 | + | ||
105 | class ZeroEntry { | ||
106 | public: | ||
107 | ZeroEntry() { | ||
108 | --- hotspot/src/share/vm/shark/sharkEntry.hpp.orig | 95 | --- hotspot/src/share/vm/shark/sharkEntry.hpp.orig |
109 | +++ hotspot/src/share/vm/shark/sharkEntry.hpp | 96 | +++ hotspot/src/share/vm/shark/sharkEntry.hpp |
110 | @@ -27,6 +27,7 @@ | 97 | @@ -27,6 +27,7 @@ |
@@ -115,31 +102,6 @@ | |||
115 | 102 | ||
116 | class SharkContext; | 103 | class SharkContext; |
117 | 104 | ||
118 | --- hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp.orig | ||
119 | +++ hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp | ||
120 | @@ -30,6 +30,10 @@ | ||
121 | |||
122 | #ifdef CC_INTERP | ||
123 | |||
124 | +#ifdef TARGET_ARCH_zero | ||
125 | +#include "entry_zero.hpp" | ||
126 | +#endif | ||
127 | + | ||
128 | class CppInterpreterGenerator: public AbstractInterpreterGenerator { | ||
129 | protected: | ||
130 | // shared code sequences | ||
131 | --- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig | ||
132 | +++ hotspot/src/cpu/zero/vm/nativeInst_zero.cpp | ||
133 | @@ -26,6 +26,9 @@ | ||
134 | #include "precompiled.hpp" | ||
135 | #include "assembler_zero.inline.hpp" | ||
136 | #include "memory/resourceArea.hpp" | ||
137 | +#ifdef CC_INTERP | ||
138 | +#include "entry_zero.hpp" | ||
139 | +#endif | ||
140 | #include "nativeInst_zero.hpp" | ||
141 | #include "oops/oop.inline.hpp" | ||
142 | #include "runtime/handles.hpp" | ||
143 | --- hotspot/src/share/vm/shark/llvmHeaders.hpp.orig | 105 | --- hotspot/src/share/vm/shark/llvmHeaders.hpp.orig |
144 | +++ hotspot/src/share/vm/shark/llvmHeaders.hpp | 106 | +++ hotspot/src/share/vm/shark/llvmHeaders.hpp |
145 | @@ -35,7 +35,11 @@ | 107 | @@ -35,7 +35,11 @@ |
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch new file mode 100644 index 0000000..b09745c --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- hotspot/src/cpu/zero/vm/entry_zero.hpp | ||
2 | +++ hotspot/src/cpu/zero/vm/entry_zero.hpp | ||
3 | @@ -26,6 +26,8 @@ | ||
4 | #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP | ||
5 | #define CPU_ZERO_VM_ENTRY_ZERO_HPP | ||
6 | |||
7 | +#include "utilities/globalDefinitions.hpp" | ||
8 | +#include "utilities/exceptions.hpp" | ||
9 | #include "interpreter/cppInterpreter.hpp" | ||
10 | |||
11 | class ZeroEntry { | ||
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch new file mode 100644 index 0000000..018640b --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | --- hotspot/src/cpu/zero/vm/entry_zero.hpp.orig | ||
2 | +++ hotspot/src/cpu/zero/vm/entry_zero.hpp | ||
3 | @@ -26,6 +26,10 @@ | ||
4 | #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP | ||
5 | #define CPU_ZERO_VM_ENTRY_ZERO_HPP | ||
6 | |||
7 | +#include "utilities/globalDefinitions.hpp" | ||
8 | +#include "utilities/exceptions.hpp" | ||
9 | +#include "interpreter/cppInterpreter.hpp" | ||
10 | + | ||
11 | class ZeroEntry { | ||
12 | public: | ||
13 | ZeroEntry() { | ||
14 | --- hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp.orig | ||
15 | +++ hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp | ||
16 | @@ -30,6 +30,10 @@ | ||
17 | |||
18 | #ifdef CC_INTERP | ||
19 | |||
20 | +#ifdef TARGET_ARCH_zero | ||
21 | +#include "entry_zero.hpp" | ||
22 | +#endif | ||
23 | + | ||
24 | class CppInterpreterGenerator: public AbstractInterpreterGenerator { | ||
25 | protected: | ||
26 | // shared code sequences | ||
27 | --- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig | ||
28 | +++ hotspot/src/cpu/zero/vm/nativeInst_zero.cpp | ||
29 | @@ -26,6 +26,9 @@ | ||
30 | #include "precompiled.hpp" | ||
31 | #include "assembler_zero.inline.hpp" | ||
32 | #include "memory/resourceArea.hpp" | ||
33 | +#ifdef CC_INTERP | ||
34 | +#include "entry_zero.hpp" | ||
35 | +#endif | ||
36 | #include "nativeInst_zero.hpp" | ||
37 | #include "oops/oop.inline.hpp" | ||
38 | #include "runtime/handles.hpp" | ||