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-common.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-common.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-common.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-common.patch new file mode 100644 index 0000000..9126495 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-common.patch | |||
@@ -0,0 +1,55 @@ | |||
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 (common) | ||
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 | hotspot/make/linux/makefiles/defs.make | 4 ++++ | ||
15 | hotspot/make/linux/makefiles/sa.make | 2 +- | ||
16 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/hotspot/make/linux/makefiles/defs.make b/hotspot/make/linux/makefiles/defs.make | ||
19 | index 3af5878a..d10bab95 100644 | ||
20 | --- a/hotspot/make/linux/makefiles/defs.make | ||
21 | +++ b/hotspot/make/linux/makefiles/defs.make | ||
22 | @@ -286,6 +286,7 @@ ifeq ($(JVM_VARIANT_MINIMAL1),true) | ||
23 | endif | ||
24 | endif | ||
25 | |||
26 | +ifeq (0,1) | ||
27 | # Serviceability Binaries | ||
28 | # No SA Support for PPC, IA64, ARM or zero | ||
29 | ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ | ||
30 | @@ -305,6 +306,9 @@ ADD_SA_BINARIES/ppc = | ||
31 | ADD_SA_BINARIES/ia64 = | ||
32 | ADD_SA_BINARIES/arm = | ||
33 | ADD_SA_BINARIES/zero = | ||
34 | +else | ||
35 | +ADD_SA_BINARIES/$(HS_ARCH) = | ||
36 | +endif | ||
37 | |||
38 | -include $(HS_ALT_MAKE)/linux/makefiles/defs.make | ||
39 | |||
40 | diff --git a/hotspot/make/linux/makefiles/sa.make b/hotspot/make/linux/makefiles/sa.make | ||
41 | index 66a7b945..61cc7244 100644 | ||
42 | --- a/hotspot/make/linux/makefiles/sa.make | ||
43 | +++ b/hotspot/make/linux/makefiles/sa.make | ||
44 | @@ -62,7 +62,7 @@ SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties | ||
45 | |||
46 | all: | ||
47 | if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \ | ||
48 | - -a "$(SRCARCH)" != "zero" ] ; then \ | ||
49 | + -a "$(SRCARCH)" != "zero" ] && [ 0 -eq 1 ] ; then \ | ||
50 | $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ | ||
51 | fi | ||
52 | |||
53 | -- | ||
54 | 2.16.2 | ||
55 | |||