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/musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch | |
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/musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch | 51 |
1 files changed, 51 insertions, 0 deletions
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 | |||