diff options
Diffstat (limited to 'recipes-core/openjdk')
17 files changed, 416 insertions, 98 deletions
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc b/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc new file mode 100644 index 0000000..9cc2083 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc | |||
@@ -0,0 +1,58 @@ | |||
1 | require openjdk-8-release-172b11-common.inc | ||
2 | |||
3 | COMPATIBLE_HOST = "^$" | ||
4 | COMPATIBLE_HOST_armv7a = "arm" | ||
5 | COMPATIBLE_HOST_armv7ve = "arm" | ||
6 | |||
7 | CORBA_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
8 | SRC_URI[corba.md5sum] = "557b94847d8fade14c048cb0a96ed035" | ||
9 | SRC_URI[corba.sha256sum] = "366fa9aaf11d75f74e8c6bdf9cab9214cf66b0eac1ca40f2789b3ba442929708" | ||
10 | |||
11 | HOTSPOT_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
12 | SRC_URI[hotspot.md5sum] = "37d796794234f38fa71339ba78368b80" | ||
13 | SRC_URI[hotspot.sha256sum] = "5f89f8ba9a099a2d84b4ca6bd49553ce4efe1b29d55de9134809b7b59b6c9ce3" | ||
14 | |||
15 | JAXP_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
16 | SRC_URI[jaxp.md5sum] = "2dc311a7c0d6483226cdc5e501b1f8d0" | ||
17 | SRC_URI[jaxp.sha256sum] = "f62db09a41213b5b5d1886c1aeabe43def09235de1d60af518213b9acea4fdca" | ||
18 | |||
19 | JAXWS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
20 | SRC_URI[jaxws.md5sum] = "fbd81e288d1ee5df631f213c130f21bb" | ||
21 | SRC_URI[jaxws.sha256sum] = "bac66e848ee48c6fef6130db4bb6879dbd64c550c1f42e4676ab6a2c3ee4fab8" | ||
22 | |||
23 | JDK_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
24 | SRC_URI[jdk.md5sum] = "b8003e6f1714617461f3eb7ee8b1efee" | ||
25 | SRC_URI[jdk.sha256sum] = "0a7eef6fef2b457bef3bd1d24031234bbb9d74a5fca2f65e1603278cd9d393a0" | ||
26 | |||
27 | LANGTOOLS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
28 | SRC_URI[langtools.md5sum] = "e38f50b0113b3a956ac4917720655e93" | ||
29 | SRC_URI[langtools.sha256sum] = "9ca88fcfe5a07861de693ff3b38d03f063a7937576cd93116ea6b4a4bd7894d5" | ||
30 | |||
31 | NASHORN_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
32 | SRC_URI[nashorn.md5sum] = "c191cc92996fcb271254fc0a4f3eb7c9" | ||
33 | SRC_URI[nashorn.sha256sum] = "853bb3162fefa989fa0c31848cb990d8e5698ccd8a2a336dbf98bde35eb5241d" | ||
34 | |||
35 | OPENJDK_CHANGESET_arm = "jdk8u172-b11-aarch32-180511" | ||
36 | SRC_URI[openjdk.md5sum] = "25398ccf25633a878dca54a8d606e48e" | ||
37 | SRC_URI[openjdk.sha256sum] = "8c8e515ebcceded4b90187b4bdaf129b63ae6e64ddfe4f05a60df0694235b9e7" | ||
38 | |||
39 | PACKAGECONFIG_append_armv7a = " client" | ||
40 | PACKAGECONFIG_append_armv7ve = " client" | ||
41 | |||
42 | do_install_append() { | ||
43 | if [ -d ${D}${JDK_HOME} ] ; then | ||
44 | sed -e 's,^\(-server ERROR$\),# \1,' \ | ||
45 | -e 's,^-client IGNORE,-client ERROR,' \ | ||
46 | -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ | ||
47 | -i ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | ||
48 | fi | ||
49 | if [ -d ${D}${JRE_HOME} ] ; then | ||
50 | sed -e 's,^\(-server ERROR$\),# \1,' \ | ||
51 | -e 's,^-client IGNORE,-client ERROR,' \ | ||
52 | -e 's,ALIASED_TO -server,ALIASED_TO -client,' \ | ||
53 | -i ${D}${JRE_HOME}/lib/${JDK_ARCH}/jvm.cfg | ||
54 | fi | ||
55 | } | ||
56 | |||
57 | JDK_ARCH_armv7a = "aarch32" | ||
58 | JDK_ARCH_armv7ve = "aarch32" | ||
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc b/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc index dddae6a..f0f4655 100644 --- a/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc +++ b/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc | |||
@@ -1,5 +1,7 @@ | |||
1 | require openjdk-8-release-172b11-common.inc | 1 | require openjdk-8-release-172b11-common.inc |
2 | 2 | ||
3 | COMPATIBLE_HOST = "aarch64" | ||
4 | |||
3 | CORBA_CHANGESET_aarch64 = "3a04a7c080af" | 5 | CORBA_CHANGESET_aarch64 = "3a04a7c080af" |
4 | SRC_URI[corba.md5sum] = "758b29d6cf714fd894df8674afd78e17" | 6 | SRC_URI[corba.md5sum] = "758b29d6cf714fd894df8674afd78e17" |
5 | SRC_URI[corba.sha256sum] = "564113dbeadc57ac5831ccc056e0b920adbd3b74558cf750aa899f5de25ceb5e" | 7 | SRC_URI[corba.sha256sum] = "564113dbeadc57ac5831ccc056e0b920adbd3b74558cf750aa899f5de25ceb5e" |
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc index 8e94a4f..0cda4bb 100644 --- a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc +++ b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc | |||
@@ -33,30 +33,52 @@ HOTSPOT_UB_PATCH_prepend_aarch64 = "\ | |||
33 | file://0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch \ | 33 | file://0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch \ |
34 | file://0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch \ | 34 | file://0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch \ |
35 | " | 35 | " |
36 | HOTSPOT_UB_PATCH_append_armv7a = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" | ||
37 | HOTSPOT_UB_PATCH_append_armv7ve = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" | ||
36 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch | 38 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch |
37 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html | 39 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html |
38 | # by Roman Kennke (rkennke at redhat.com) | 40 | # by Roman Kennke (rkennke at redhat.com) |
39 | LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0" | 41 | LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0" |
40 | LIBPNG_NEON_PATCH_aarch64 = "" | 42 | LIBPNG_NEON_PATCH_aarch64 = "" |
43 | |||
41 | PATCHES_URI_append_class-target = "\ | 44 | PATCHES_URI_append_class-target = "\ |
42 | file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ | 45 | file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ |
43 | file://openjdk8-fix-shark-build.patch;striplevel=0 \ | 46 | file://openjdk8-fix-shark-build-common.patch;striplevel=0 \ |
47 | ${FIX_SHARK_BUILD_PT2_PATCH} \ | ||
44 | file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ | 48 | file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ |
45 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ | 49 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ |
46 | file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ | 50 | file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ |
47 | file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ | 51 | file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ |
48 | " | 52 | " |
53 | FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0" | ||
54 | FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" | ||
55 | FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" | ||
56 | |||
49 | PATCHES_URI_append_libc-musl = "\ | 57 | PATCHES_URI_append_libc-musl = "\ |
50 | file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch \ | 58 | ${OBSOLETE_ISNANF_PATCH} \ |
51 | file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ | 59 | file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ |
52 | file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ | 60 | file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ |
53 | file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ | 61 | file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ |
54 | file://musl-0005-hotspot-disable-agent-build.patch \ | 62 | file://musl-0005-hotspot-disable-agent-build-common.patch \ |
55 | file://musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch \ | 63 | ${DISABLE_AGENT_BUILD_PT2} \ |
64 | file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \ | ||
65 | ${REMOVE_GLIBC_DEPENDENCIES_PT2} \ | ||
56 | file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ | 66 | file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ |
57 | file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ | 67 | file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ |
58 | file://musl-0009-jdk-musl-has-gethostby_r.patch \ | 68 | file://musl-0009-jdk-musl-has-gethostby_r.patch \ |
59 | " | 69 | " |
70 | OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch" | ||
71 | OBSOLETE_ISNANF_PATCH_armv7a = "" | ||
72 | OBSOLETE_ISNANF_PATCH_armv7ve = "" | ||
73 | DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch" | ||
74 | DISABLE_AGENT_BUILD_PT2_armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" | ||
75 | DISABLE_AGENT_BUILD_PT2_armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" | ||
76 | REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch" | ||
77 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | ||
78 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | ||
79 | |||
80 | PATCHES_URI_append_libc-musl_armv7a = " file://hotspot-remaining-musl-fixes-aarch32.patch" | ||
81 | PATCHES_URI_append_libc-musl_armv7ve = " file://hotspot-remaining-musl-fixes-aarch32.patch" | ||
60 | PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" | 82 | PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" |
61 | 83 | ||
62 | # Name of the directory containing the compiled output | 84 | # Name of the directory containing the compiled output |
@@ -72,10 +94,14 @@ BUILD_CFLAGS_append = " -Wno-error=deprecated-declarations" | |||
72 | TARGET_CFLAGS_append = " -Wno-error=deprecated-declarations" | 94 | TARGET_CFLAGS_append = " -Wno-error=deprecated-declarations" |
73 | 95 | ||
74 | # Enable zero mode for arm based builds, as normal hotspot fails to build | 96 | # Enable zero mode for arm based builds, as normal hotspot fails to build |
75 | PACKAGECONFIG_append_arm = " zero" | 97 | PACKAGECONFIG_append_armv4 = " zero" |
98 | PACKAGECONFIG_append_armv5 = " zero" | ||
99 | PACKAGECONFIG_append_armv6 = " zero" | ||
76 | 100 | ||
77 | OPENJDK_ARCH_PORT = "jdk8u" | 101 | OPENJDK_ARCH_PORT = "jdk8u" |
78 | OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" | 102 | OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" |
103 | OPENJDK_ARCH_PORT_armv7a = "aarch32-port" | ||
104 | OPENJDK_ARCH_PORT_armv7ve = "aarch32-port" | ||
79 | OPENJDK_HG_U = "jdk8u" | 105 | OPENJDK_HG_U = "jdk8u" |
80 | OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" | 106 | OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" |
81 | 107 | ||
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11.inc b/recipes-core/openjdk/openjdk-8-release-172b11.inc index fdf7b39..b308e50 100644 --- a/recipes-core/openjdk/openjdk-8-release-172b11.inc +++ b/recipes-core/openjdk/openjdk-8-release-172b11.inc | |||
@@ -1,7 +1,10 @@ | |||
1 | require openjdk-8-release-172b11-common.inc | 1 | require openjdk-8-release-172b11-common.inc |
2 | 2 | ||
3 | # We do not yet work for aarch64. | 3 | # We do not yet work for aarch64, and we make sure |
4 | COMPATIBLE_HOST = "^(?!aarch64).*" | 4 | # to use the aarch32 port for ARMv7. |
5 | COMPATIBLE_HOST = "^(?!(aarch64)).*$" | ||
6 | COMPATIBLE_HOST_armv7a = "^$" | ||
7 | COMPATIBLE_HOST_armv7ve = "^$" | ||
5 | 8 | ||
6 | CORBA_CHANGESET = "875a75c440cd" | 9 | CORBA_CHANGESET = "875a75c440cd" |
7 | SRC_URI[corba.md5sum] = "66242dd6e749f39a5ef6add34f5ecb2f" | 10 | SRC_URI[corba.md5sum] = "66242dd6e749f39a5ef6add34f5ecb2f" |
diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb b/recipes-core/openjdk/openjdk-8_172b11.bb index 9c2a7a1..c1c6e1e 100644 --- a/recipes-core/openjdk/openjdk-8_172b11.bb +++ b/recipes-core/openjdk/openjdk-8_172b11.bb | |||
@@ -1,5 +1,7 @@ | |||
1 | INC_FILE_SUFFIX = "" | 1 | INC_FILE_SUFFIX = "" |
2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" | 2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" |
3 | INC_FILE_SUFFIX_armv7a = "-aarch32" | ||
4 | INC_FILE_SUFFIX_armv7ve = "-aarch32" | ||
3 | require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc | 5 | require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc |
4 | require openjdk-8-cross.inc | 6 | require openjdk-8-cross.inc |
5 | 7 | ||
diff --git a/recipes-core/openjdk/openjre-8_172b11.bb b/recipes-core/openjdk/openjre-8_172b11.bb index 220dc01..dd29691 100644 --- a/recipes-core/openjdk/openjre-8_172b11.bb +++ b/recipes-core/openjdk/openjre-8_172b11.bb | |||
@@ -1,5 +1,7 @@ | |||
1 | INC_FILE_SUFFIX = "" | 1 | INC_FILE_SUFFIX = "" |
2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" | 2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" |
3 | INC_FILE_SUFFIX_armv7a = "-aarch32" | ||
4 | INC_FILE_SUFFIX_armv7ve = "-aarch32" | ||
3 | require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc | 5 | require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc |
4 | require openjdk-8-cross.inc | 6 | require openjdk-8-cross.inc |
5 | 7 | ||
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" | ||