summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-12-30 14:35:59 (GMT)
committerRichard Leitner <richard.leitner@skidata.com>2020-01-28 14:09:31 (GMT)
commit7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch)
tree398a12e3addb7470622d4cb2f98e7ad2dda02c5c
parent19b569281cc30e3aa94e772d6885cd340b1d1724 (diff)
downloadmeta-java-7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14.tar.gz
openjdk-8: update to latest ga version 242
As OpenJDK-8 is now tagging "ga" versions in addition to the "build" version the recipes are adapted to use those "ga" versions. All existing patches got re-applied and renamed. For better handling Hotspot patches now start at patch number 1001 and jdk patches at 2001. Furthermore architecture dependent patches are prefixed with the architecture they apply on. Following patches/hunks were completely dropped: - 0002-hotspot-fix-compilation-with-security-flags-enabled.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185 - 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch ostream.cpp:112 got fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502 - 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 - 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd - 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c - openjdk8-add-missing-linker-flags.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a - openjdk8-fix-shark-stdc++11.patch fixed in hotspot jdk8u - openjdk8-fix-libpng-neon-build.patch fixed in jdk https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1 - aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u Following patches were newly added: - 0011-autoconf-fix-CC-with-arguments-detection.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" - 0012-autoconf-NativeCompilation-remove-sysroot.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" Additionally add UPDATING.md which describes the openjdk8 update process for this layer and update8checksums.sh, a script that updates the openjdk8 source archive checksums in the corresponding .inc files. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r--docs/UPDATING.md16
-rwxr-xr-xdocs/update8checksums.sh64
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc13
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc27
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc5
-rw-r--r--recipes-core/openjdk/openjdk-8-native_172b11.bb2
-rw-r--r--recipes-core/openjdk/openjdk-8-native_242.bb2
-rw-r--r--recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc58
-rw-r--r--recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc35
-rw-r--r--recipes-core/openjdk/openjdk-8-release-172b11.inc39
-rw-r--r--recipes-core/openjdk/openjdk-8-release-aarch32.inc60
-rw-r--r--recipes-core/openjdk/openjdk-8-release-aarch64.inc37
-rw-r--r--recipes-core/openjdk/openjdk-8-release-common.inc (renamed from recipes-core/openjdk/openjdk-8-release-172b11-common.inc)102
-rw-r--r--recipes-core/openjdk/openjdk-8-release.inc39
-rw-r--r--recipes-core/openjdk/openjdk-8_242.bb (renamed from recipes-core/openjdk/openjdk-8_172b11.bb)4
-rw-r--r--recipes-core/openjdk/openjre-8_242.bb (renamed from recipes-core/openjdk/openjre-8_172b11.bb)3
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch77
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch80
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch41
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0010-build-fix-build-on-as-needed-toolchains-generic.patch)12
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch (renamed from recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch)21
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch148
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch25
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch (renamed from recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch)19
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch36
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch37
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch (renamed from recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch)98
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch (renamed from recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch)25
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch43
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch24
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch41
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch42
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch47
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch43
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch)13
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch)24
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch)12
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch)63
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0015-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch)21
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch)36
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0017-hotspot-Missing-return-statement-in-__sync_val_compa.patch)18
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0019-hotspot-Turn-on-the-Wreturn-type-warning.patch)70
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch34
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch (renamed from recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch)33
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch (renamed from recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-common.patch)322
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1012-hotspot-restrict-to-staging-dir.patch26
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0001-jdk-comparison-between-pointer-and-integer.patch)34
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0003-jdk-Allow-using-a-system-installed-libjpeg.patch)84
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch83
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0007-jdk-use-correct-include-for-poll.patch)47
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch)23
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch)13
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch32
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch (renamed from recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch)66
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch13
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-missing-return-values.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0001-hotspot-aarch32-fix-missing-return-values.patch)0
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-fix-shark-build-pt2.patch (renamed from recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch)0
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/aarch32-hotspot-remaining-musl-fixes.patch (renamed from recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch32.patch)0
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-Fix-further-functions-with-a-missing.patch (renamed from recipes-core/openjdk/patches-openjdk-8/0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch)0
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/aarch64-hotspot-remaining-musl-fixes.patch (renamed from recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch64.patch)0
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/filter-aclocal-copy-too.patch11
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/hotspot-handle-gcc7-format-overflow.patch25
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-add-missing-linker-flags.patch57
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch140
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch20
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-libpng-neon-build.patch29
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch35
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch2631
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-no-genx11-in-headless.patch17
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-restrict-to-staging-dir.patch11
70 files changed, 1390 insertions, 4018 deletions
diff --git a/docs/UPDATING.md b/docs/UPDATING.md
new file mode 100644
index 0000000..87d4bf1
--- /dev/null
+++ b/docs/UPDATING.md
@@ -0,0 +1,16 @@
1# HowTo Update OpenJDK 8 #
2
31. Determine latest ga version:
4 curl -s "https://hg.openjdk.java.net/jdk8u/jdk8u/tags" | grep -m 1 "jdk8u.*ga" | sed 's/-ga$//g'
52. Rename OpenJDK/OpenJRE bb files to the matching release version
63. Adapt the CHANGESET_ID for aarch32 based on:
7 curl -s https://hg.openjdk.java.net/aarch32-port/jdk8u/tags | grep "jdk8u.*ga-aarch32-"
84. Adapt the CHANGESET_ID for aarch64 based on:
9 curl -s https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/tags | grep "aarch64-shenandoah-jdk8u.*-"
105. Adapt source archive checksums by executing the script
11 ./docs/update8checksums.sh
126. Check if any patch got upstreamed (and remove if so)
137. Re-apply all other patches and format them again
14 for git: git format-patch --src-prefix=a/y/ --dst-prefix=b/y/ -n --start-number=x jdk8uXXX-ga
158. Test for x86_64, aarch32 & aarch64 (at least using testimage in qemu)
169. Send a patch ;-)
diff --git a/docs/update8checksums.sh b/docs/update8checksums.sh
new file mode 100755
index 0000000..476841b
--- /dev/null
+++ b/docs/update8checksums.sh
@@ -0,0 +1,64 @@
1#!/bin/bash
2#
3# quick-hack-script for updating the openjdk 8 source archive checksums
4#
5#set -x
6set -e
7
8function updateChecksums() {
9 echo "updating ${ARCH} checksums..."
10 for repo in ${REPOS}; do
11 repoDL="/${repo}"
12 [ "${repo}" == "openjdk" ] && repoDL=""
13 echo -n " ${ARCH}/${repo}."
14 wget -q "${BASEURL}${repoDL}/archive/${TAG}.tar.bz2" -O "${tmpfile}"
15 echo -n "."
16 md5="$(md5sum "${tmpfile}" | cut -d " " -f1)"
17 echo -n "."
18 sha="$(sha256sum "${tmpfile}" | cut -d " " -f1)"
19 echo -n "."
20 sed -i "s|^SRC_URI\\[${repo}.md5sum\\].*\$|SRC_URI\\[${repo}.md5sum\\] = \\\"${md5}\\\"|g" "${INCFILE}"
21 sed -i "s|^SRC_URI\\[${repo}.sha256sum\\].*\$|SRC_URI\\[${repo}.sha256sum\\] = \\\"${sha}\\\"|g" "${INCFILE}"
22 echo " done"
23 done
24}
25
26REPOS="corba hotspot jaxp jaxws jdk langtools nashorn openjdk"
27OPENJDK_UPDATE="$(basename "$(ls -1 recipes-core/openjdk/openjdk-8_*.bb)" | cut -d _ -f2 | cut -d . -f1)"
28
29COMMON_BASEURL="https://hg.openjdk.java.net/jdk8u/jdk8u"
30COMMON_TAG="jdk8u${OPENJDK_UPDATE}-ga"
31
32AARCH32_BASEURL="https://hg.openjdk.java.net/aarch32-port/jdk8u"
33AARCH32_CHANGESET_ID="$(grep "^CHANGESET_ID" recipes-core/openjdk/openjdk-8-release-aarch32.inc | cut -d= -f2 | tr -d \")"
34AARCH32_TAG="jdk8u${OPENJDK_UPDATE}-ga-aarch32-${AARCH32_CHANGESET_ID}"
35
36AARCH64_BASEURL="https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah"
37AARCH64_CHANGESET_ID="$(grep "^CHANGESET_ID" recipes-core/openjdk/openjdk-8-release-aarch64.inc | cut -d= -f2 | tr -d \")"
38AARCH64_TAG="aarch64-shenandoah-jdk8u${OPENJDK_UPDATE}-${AARCH64_CHANGESET_ID}"
39
40echo "meta-java openjdk8 source archive checksum update script"
41
42tmpfile="$(mktemp)"
43
44ARCH="common"
45BASEURL="${COMMON_BASEURL}"
46TAG="${COMMON_TAG}"
47INCFILE="recipes-core/openjdk/openjdk-8-release.inc"
48updateChecksums
49
50ARCH="aarch32"
51BASEURL="${AARCH32_BASEURL}"
52TAG="${AARCH32_TAG}"
53INCFILE="recipes-core/openjdk/openjdk-8-release-aarch32.inc"
54updateChecksums
55
56ARCH="aarch64"
57BASEURL="${AARCH64_BASEURL}"
58TAG="${AARCH64_TAG}"
59INCFILE="recipes-core/openjdk/openjdk-8-release-aarch64.inc"
60updateChecksums
61
62rm -f "${tmpfile}"
63
64echo "SUCCESS"
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 1fbe7fe..0ef4750 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -8,13 +8,13 @@ require openjdk-common.inc
8 8
9AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" 9AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/"
10export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" 10export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}"
11
12FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-8:" 11FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-8:"
13 12
14# for weird openjdk-common.inc 13# for weird openjdk-common.inc
15S = "${WORKDIR}/${OPENJDK_HG_U}-${OPENJDK_CHANGESET}" 14S = "${WORKDIR}/${OPENJDK_HG_U}-${OPENJDK_CHANGESET}"
15export TOPDIR="${S}"
16 16
17SRC_URI = " \ 17SRC_URI = "\
18 ${OPENJDK_URI} \ 18 ${OPENJDK_URI} \
19 ${HOTSPOT_URI} \ 19 ${HOTSPOT_URI} \
20 ${CORBA_URI} \ 20 ${CORBA_URI} \
@@ -155,16 +155,12 @@ def jdk_configure_options(d):
155do_unpack[postfuncs] += "do_unpack_extract_submodules" 155do_unpack[postfuncs] += "do_unpack_extract_submodules"
156do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" 156do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}"
157 157
158do_configure_prepend() {
159 export ${@jdk_environment_options(d)}
160}
161
162export DEBUG_BINARIES = "true" 158export DEBUG_BINARIES = "true"
163 159
164ALTERNATIVE_PRIORITY = "50" 160ALTERNATIVE_PRIORITY = "50"
165 161
166OPENJDK_UPDATE_VERSION = "${@d.getVar('PV').split('b')[0]}" 162OPENJDK_UPDATE_VERSION = "${PV}"
167OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV').split('b')[1]}" 163OPENJDK_BUILD_NUMBER = "ga"
168EXTRA_OECONF_append = "\ 164EXTRA_OECONF_append = "\
169 --with-build-number=${OPENJDK_BUILD_NUMBER} \ 165 --with-build-number=${OPENJDK_BUILD_NUMBER} \
170 --with-update-version=${OPENJDK_UPDATE_VERSION} \ 166 --with-update-version=${OPENJDK_UPDATE_VERSION} \
@@ -176,6 +172,7 @@ EXTRA_OECONF_append = "\
176FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" 172FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
177FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" 173FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
178FLAGS_GCC8 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" 174FLAGS_GCC8 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
175FLAGS_GCC9 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
179 176
180# flags for -native, and for bits that need a host-tool during -cross 177# flags for -native, and for bits that need a host-tool during -cross
181BUILD_CFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}" 178BUILD_CFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}"
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index 18b99fd..6c0f949 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -13,6 +13,7 @@ PRIVATE_LIBS = "\
13 libjdwp.so libjli.so libjpeg.so libjsdt.so libjsig.so libjvm.so liblcms.so \ 13 libjdwp.so libjli.so libjpeg.so libjsdt.so libjsig.so libjvm.so liblcms.so \
14 libmanagement.so libmlib_image.so libnet.so libnio.so libnpt.so libsaproc.so \ 14 libmanagement.so libmlib_image.so libnet.so libnio.so libnpt.so libsaproc.so \
15 libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \ 15 libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \
16 libfreetype.so.6 \
16" 17"
17 18
18PACKAGECONFIG ??= " \ 19PACKAGECONFIG ??= " \
@@ -42,23 +43,22 @@ PACKAGECONFIG[repack] = ",,,"
42 43
43PACKAGECONFIG[kerberos] = ",,krb5" 44PACKAGECONFIG[kerberos] = ",,krb5"
44 45
45CACHED_CONFIGUREVARS = " \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_includes=${STAGING_INCDIR}', '', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_libraries=${STAGING_LIBDIR}', '', d)} \
48"
49
50require openjdk-8-common.inc 46require openjdk-8-common.inc
51 47
52JAVA_HOME[unexport] = "1" 48JAVA_HOME[unexport] = "1"
53 49
54SRC_URI_append = "\ 50SRC_URI_append = "\
55 file://jvm.cfg \ 51 file://jvm.cfg \
52 file://0011-autoconf-fix-CC-with-arguments-detection.patch \
53 file://0012-autoconf-NativeCompilation-remove-sysroot.patch \
56" 54"
57 55
56BUILD_CFLAGS_append = " -Wno-stringop-overflow -Wno-error"
57TARGET_CFLAGS_append = " -Wno-stringop-overflow -Wno-error"
58
58EXTRA_OECONF_append = "\ 59EXTRA_OECONF_append = "\
59 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ 60 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
60 \ 61 \
61 --with-sys-root=${STAGING_DIR_HOST} \
62 --with-tools-dir=${STAGING_DIR_NATIVE} \ 62 --with-tools-dir=${STAGING_DIR_NATIVE} \
63 --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \ 63 --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \
64 --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \ 64 --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \
@@ -66,13 +66,21 @@ EXTRA_OECONF_append = "\
66 --disable-precompiled-headers \ 66 --disable-precompiled-headers \
67 --disable-zip-debug-info \ 67 --disable-zip-debug-info \
68 \ 68 \
69 --with-sys-root=${STAGING_DIR_HOST} \
69 --with-extra-cflags='${CFLAGS}' \ 70 --with-extra-cflags='${CFLAGS}' \
70 --with-extra-cxxflags='${CXXFLAGS}' \ 71 --with-extra-cxxflags='${CXXFLAGS}' \
71 --with-extra-ldflags='${LDFLAGS}' \ 72 --with-extra-ldflags='${LDFLAGS}' \
73 --with-freetype-include=${STAGING_INCDIR}/freetype2 \
74 --with-freetype-lib=${STAGING_LIBDIR} \
72 \ 75 \
73 ${@jdk_configure_options(d)} \ 76 ${@jdk_configure_options(d)} \
74" 77"
75 78
79do_configure_prepend() {
80 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
81 export ${@jdk_environment_options(d)}
82}
83
76do_configure_append() { 84do_configure_append() {
77 sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk 85 sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk
78} 86}
@@ -97,8 +105,6 @@ do_install_append() {
97export MAKE_VERBOSE = "y" 105export MAKE_VERBOSE = "y"
98export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" 106export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip"
99 107
100BUILD_LD="${BUILD_CCLD}"
101
102EXTRA_OEMAKE_append = '\ 108EXTRA_OEMAKE_append = '\
103 ${@jdk_make_options(d)} \ 109 ${@jdk_make_options(d)} \
104 ALT_SDT_H="${STAGING_INCDIR}" \ 110 ALT_SDT_H="${STAGING_INCDIR}" \
@@ -125,5 +131,6 @@ python remove_debuglink() {
125 131
126PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" 132PACKAGE_PREPROCESS_FUNCS += "remove_debuglink"
127 133
128# There is a symlink to a .so but this one is valid. 134# FIXME libjsig.so is a symlink to a .so but this one is valid
129INSANE_SKIP_${PN} = "dev-so" 135# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped
136INSANE_SKIP_${PN} = "dev-so already-stripped"
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index bae5d09..321a43d 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -20,12 +20,13 @@ PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native"
20EXTRA_OECONF_append = "\ 20EXTRA_OECONF_append = "\
21 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ 21 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
22 \ 22 \
23 --with-sys-root=${STAGING_DIR_NATIVE} \
24 --with-tools-dir=${STAGING_DIR_NATIVE} \ 23 --with-tools-dir=${STAGING_DIR_NATIVE} \
25 --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/icedtea7-native \ 24 --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/icedtea7-native \
26 --with-extra-cflags='${CFLAGS}' \ 25 --with-extra-cflags='${CFLAGS}' \
27 --with-extra-cxxflags='${CXXFLAGS}' \ 26 --with-extra-cxxflags='${CXXFLAGS}' \
28 --with-extra-ldflags='${LDFLAGS}' \ 27 --with-extra-ldflags='${LDFLAGS}' \
28 --with-freetype-include=${STAGING_INCDIR_NATIVE}/freetype2 \
29 --with-freetype-lib=${STAGING_LIBDIR_NATIVE} \
29 --with-stdc++lib=dynamic \ 30 --with-stdc++lib=dynamic \
30 ${@jdk_configure_options(d)} \ 31 ${@jdk_configure_options(d)} \
31" 32"
@@ -51,6 +52,8 @@ EXTRA_OEMAKE_append = ' \
51 52
52do_configure_prepend() { 53do_configure_prepend() {
53 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" 54 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
55 export ${@jdk_environment_options(d)}
56 unset CC CXX
54} 57}
55 58
56do_compile_prepend() { 59do_compile_prepend() {
diff --git a/recipes-core/openjdk/openjdk-8-native_172b11.bb b/recipes-core/openjdk/openjdk-8-native_172b11.bb
deleted file mode 100644
index e7eb21c..0000000
--- a/recipes-core/openjdk/openjdk-8-native_172b11.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require openjdk-8-release-${PV}.inc
2require openjdk-8-native.inc
diff --git a/recipes-core/openjdk/openjdk-8-native_242.bb b/recipes-core/openjdk/openjdk-8-native_242.bb
new file mode 100644
index 0000000..39321f2
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-native_242.bb
@@ -0,0 +1,2 @@
1require openjdk-8-release.inc
2require openjdk-8-native.inc
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc b/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc
deleted file mode 100644
index 9cc2083..0000000
--- a/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc
+++ /dev/null
@@ -1,58 +0,0 @@
1require openjdk-8-release-172b11-common.inc
2
3COMPATIBLE_HOST = "^$"
4COMPATIBLE_HOST_armv7a = "arm"
5COMPATIBLE_HOST_armv7ve = "arm"
6
7CORBA_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
8SRC_URI[corba.md5sum] = "557b94847d8fade14c048cb0a96ed035"
9SRC_URI[corba.sha256sum] = "366fa9aaf11d75f74e8c6bdf9cab9214cf66b0eac1ca40f2789b3ba442929708"
10
11HOTSPOT_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
12SRC_URI[hotspot.md5sum] = "37d796794234f38fa71339ba78368b80"
13SRC_URI[hotspot.sha256sum] = "5f89f8ba9a099a2d84b4ca6bd49553ce4efe1b29d55de9134809b7b59b6c9ce3"
14
15JAXP_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
16SRC_URI[jaxp.md5sum] = "2dc311a7c0d6483226cdc5e501b1f8d0"
17SRC_URI[jaxp.sha256sum] = "f62db09a41213b5b5d1886c1aeabe43def09235de1d60af518213b9acea4fdca"
18
19JAXWS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
20SRC_URI[jaxws.md5sum] = "fbd81e288d1ee5df631f213c130f21bb"
21SRC_URI[jaxws.sha256sum] = "bac66e848ee48c6fef6130db4bb6879dbd64c550c1f42e4676ab6a2c3ee4fab8"
22
23JDK_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
24SRC_URI[jdk.md5sum] = "b8003e6f1714617461f3eb7ee8b1efee"
25SRC_URI[jdk.sha256sum] = "0a7eef6fef2b457bef3bd1d24031234bbb9d74a5fca2f65e1603278cd9d393a0"
26
27LANGTOOLS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
28SRC_URI[langtools.md5sum] = "e38f50b0113b3a956ac4917720655e93"
29SRC_URI[langtools.sha256sum] = "9ca88fcfe5a07861de693ff3b38d03f063a7937576cd93116ea6b4a4bd7894d5"
30
31NASHORN_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
32SRC_URI[nashorn.md5sum] = "c191cc92996fcb271254fc0a4f3eb7c9"
33SRC_URI[nashorn.sha256sum] = "853bb3162fefa989fa0c31848cb990d8e5698ccd8a2a336dbf98bde35eb5241d"
34
35OPENJDK_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
36SRC_URI[openjdk.md5sum] = "25398ccf25633a878dca54a8d606e48e"
37SRC_URI[openjdk.sha256sum] = "8c8e515ebcceded4b90187b4bdaf129b63ae6e64ddfe4f05a60df0694235b9e7"
38
39PACKAGECONFIG_append_armv7a = " client"
40PACKAGECONFIG_append_armv7ve = " client"
41
42do_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
57JDK_ARCH_armv7a = "aarch32"
58JDK_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
deleted file mode 100644
index f0f4655..0000000
--- a/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc
+++ /dev/null
@@ -1,35 +0,0 @@
1require openjdk-8-release-172b11-common.inc
2
3COMPATIBLE_HOST = "aarch64"
4
5CORBA_CHANGESET_aarch64 = "3a04a7c080af"
6SRC_URI[corba.md5sum] = "758b29d6cf714fd894df8674afd78e17"
7SRC_URI[corba.sha256sum] = "564113dbeadc57ac5831ccc056e0b920adbd3b74558cf750aa899f5de25ceb5e"
8
9HOTSPOT_CHANGESET_aarch64 = "1ced2ae00e35"
10SRC_URI[hotspot.md5sum] = "1db8a0e5e63352f1743e9d41ab6ed5cf"
11SRC_URI[hotspot.sha256sum] = "6993c3138035a7c0d2782b1ca7aabdb43452b1abbcc60448042f5c9207b03ab5"
12
13JAXP_CHANGESET_aarch64 = "ab8087f496fe"
14SRC_URI[jaxp.md5sum] = "0e7d8755af72aaf9ec7521514d8bb541"
15SRC_URI[jaxp.sha256sum] = "6e70c1535d738dc2c4e3a2fb9e6e11c660172b6d2ce905ec33e8924f8c208978"
16
17JAXWS_CHANGESET_aarch64 = "1e71aeefeecf"
18SRC_URI[jaxws.md5sum] = "16ff9ba1007aee21ad3df472b1f5c55e"
19SRC_URI[jaxws.sha256sum] = "b6ccb2855c2e9cd5778b193b5ad47f2e13496cbbbad74497c70216cd04b4c7dc"
20
21JDK_CHANGESET_aarch64 = "e8e6553e7ca9"
22SRC_URI[jdk.md5sum] = "52b35732c17e9048e506b7b46c1282f8"
23SRC_URI[jdk.sha256sum] = "ffaa79dad3b126af77ac9c230c54805b224c5d6517830a37c7272678407c99da"
24
25LANGTOOLS_CHANGESET_aarch64 = "14d381cbe563"
26SRC_URI[langtools.md5sum] = "d14425cc0334ed46ce695c9930bff6d5"
27SRC_URI[langtools.sha256sum] = "a4334c8859fe48bf2eae3b076785ff2e36a5ae80cf5840aef32731c3099a2274"
28
29NASHORN_CHANGESET_aarch64 = "c667b467b394"
30SRC_URI[nashorn.md5sum] = "0389c953bdd14c804d873d95ff4b3033"
31SRC_URI[nashorn.sha256sum] = "7cd87e641f0781481635593c144c8030f20d97cfc048ca57bd56381bab8e7d92"
32
33OPENJDK_CHANGESET_aarch64 = "74564d40b0d6"
34SRC_URI[openjdk.md5sum] = "13f7f15386f7aa0cc3383e9d1e98d2f1"
35SRC_URI[openjdk.sha256sum] = "a6425e11700edcdc0761df9da75b28b48adc664f3d8259c49ced1c85af3dc502"
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11.inc b/recipes-core/openjdk/openjdk-8-release-172b11.inc
deleted file mode 100644
index b308e50..0000000
--- a/recipes-core/openjdk/openjdk-8-release-172b11.inc
+++ /dev/null
@@ -1,39 +0,0 @@
1require openjdk-8-release-172b11-common.inc
2
3# We do not yet work for aarch64, and we make sure
4# to use the aarch32 port for ARMv7.
5COMPATIBLE_HOST = "^(?!(aarch64)).*$"
6COMPATIBLE_HOST_armv7a = "^$"
7COMPATIBLE_HOST_armv7ve = "^$"
8
9CORBA_CHANGESET = "875a75c440cd"
10SRC_URI[corba.md5sum] = "66242dd6e749f39a5ef6add34f5ecb2f"
11SRC_URI[corba.sha256sum] = "f1618be7ad88619c7d7c1eed9800c528d0646e1c9f039e20a57b3e72ae3d3512"
12
13HOTSPOT_CHANGESET = "32ba4d2121c1"
14SRC_URI[hotspot.md5sum] = "a3e1d2f91ba8873f71e9a72043e2644a"
15SRC_URI[hotspot.sha256sum] = "680b1f5100786910bfceeef90ce28d74fcf6eacfdd3b92dfc76dcf3216060e99"
16
17JAXP_CHANGESET = "30586bb50743"
18SRC_URI[jaxp.md5sum] = "b413b1cb709d74e513f13c586215366d"
19SRC_URI[jaxp.sha256sum] = "ba36dd8ad72ff3d8bda38b7d6773037e18c3c68ebadd61f1e1f7fc167a506baa"
20
21JAXWS_CHANGESET = "452a6a5a878e"
22SRC_URI[jaxws.md5sum] = "5c3c4d1fec19398128cf818aef5486a9"
23SRC_URI[jaxws.sha256sum] = "89aa34e6bc3410a85ea697aa4ae70c21f7099efdacef78a6e5a46747421e86f9"
24
25JDK_CHANGESET = "5ccc572f4ffe"
26SRC_URI[jdk.md5sum] = "29dd4772e3862193e56007a0bb0d6886"
27SRC_URI[jdk.sha256sum] = "4d1758ceec155fcd2cd786f11071ed614947a9720373d704221d78ed98beadec"
28
29LANGTOOLS_CHANGESET = "34ee52bc68a4"
30SRC_URI[langtools.md5sum] = "b195802f2aaa5c95c06cc50021bb42a6"
31SRC_URI[langtools.sha256sum] = "0403bd2c9a45e4c0dc2148907028e0cdfd087be512e6d6b3763a01411936663a"
32
33NASHORN_CHANGESET = "7efd6152328e"
34SRC_URI[nashorn.md5sum] = "3aa4b31fdbf330baf28194e21697b8d6"
35SRC_URI[nashorn.sha256sum] = "8b5cbd29e9dbace477a57d7c07a127312dd3cf6b8e648b0b64026616d12c6862"
36
37OPENJDK_CHANGESET = "33d274a7dda0"
38SRC_URI[openjdk.md5sum] = "105f62e8f22a68b8c4151c68a447f76e"
39SRC_URI[openjdk.sha256sum] = "bf49215fe1e43e6f110470c911fce32722c843e03efb68e40cc7a832eb80faea"
diff --git a/recipes-core/openjdk/openjdk-8-release-aarch32.inc b/recipes-core/openjdk/openjdk-8-release-aarch32.inc
new file mode 100644
index 0000000..686b562
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-release-aarch32.inc
@@ -0,0 +1,60 @@
1require openjdk-8-release-common.inc
2
3COMPATIBLE_HOST = "^$"
4COMPATIBLE_HOST_armv7a = "arm"
5COMPATIBLE_HOST_armv7ve = "arm"
6
7CHANGESET_ID="200120"
8
9CORBA_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}"
10SRC_URI[corba.md5sum] = "2abf6d5394d9c5310af1e4ca6cec4355"
11SRC_URI[corba.sha256sum] = "52e83dfa2fa4fcc8c71f3b2959cca2136099b9c575d3726148c02b9cf7d06324"
12
13HOTSPOT_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}"
14SRC_URI[hotspot.md5sum] = "e252af6c20d6190e0613f39c6066e3cc"
15SRC_URI[hotspot.sha256sum] = "bfff2ef23ee80acd73a0774e7011028c3598e75d2ee8b3271524ec8ea54801ae"
16
17JAXP_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}"
18SRC_URI[jaxp.md5sum] = "56dc7a99589582b18bbbb5c4464022c8"
19SRC_URI[jaxp.sha256sum] = "430e49ba485737c02312557f4deb8562853e58be19ed175ea63b396307f140ce"
20
21JAXWS_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}"
22SRC_URI[jaxws.md5sum] = "2bbcba759f24f5dcec0c33cd62382e4f"
23SRC_URI[jaxws.sha256sum] = "c350716ff8782cc311ca17450e2d198d707d3fb71de9dc3394df39766979559f"
24
25JDK_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}"
26SRC_URI[jdk.md5sum] = "e17f3f4ea8a409e4a1b09a12b3b5309d"
27SRC_URI[jdk.sha256sum] = "dfa4a7e7f8ab8daf34343b1c33544b6209e422c74d5be1dbbd8ef80e2365c8aa"
28
29LANGTOOLS_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}"
30SRC_URI[langtools.md5sum] = "06ca78c1d4e058f277876f4e6177d9b0"
31SRC_URI[langtools.sha256sum] = "59ccafa433f5510c91835efcafbe9ff9c707034ec3305dc3a4c1a85fac65ab0c"
32
33NASHORN_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}"
34SRC_URI[nashorn.md5sum] = "1958e204f3984abeb2cf9e7c57aa7839"
35SRC_URI[nashorn.sha256sum] = "e964721e539807a38bdcbce7259d235f873974a686badbc274b7368a288f0021"
36
37OPENJDK_CHANGESET_arm = "jdk8u${PV}-ga-aarch32-${CHANGESET_ID}"
38SRC_URI[openjdk.md5sum] = "9aceb3b4cd710cdda55be4fe6a5303c9"
39SRC_URI[openjdk.sha256sum] = "9691291b26a650d854ce0feacf32dfb3b956165c5d2db6e1ff46dd44f4c517cf"
40
41PACKAGECONFIG_append_armv7a = " client"
42PACKAGECONFIG_append_armv7ve = " client"
43
44do_install_append() {
45 if [ -d ${D}${JDK_HOME} ] ; then
46 sed -e 's,^\(-server ERROR$\),# \1,' \
47 -e 's,^-client IGNORE,-client ERROR,' \
48 -e 's,ALIASED_TO -server,ALIASED_TO -client,' \
49 -i ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
50 fi
51 if [ -d ${D}${JRE_HOME} ] ; then
52 sed -e 's,^\(-server ERROR$\),# \1,' \
53 -e 's,^-client IGNORE,-client ERROR,' \
54 -e 's,ALIASED_TO -server,ALIASED_TO -client,' \
55 -i ${D}${JRE_HOME}/lib/${JDK_ARCH}/jvm.cfg
56 fi
57}
58
59JDK_ARCH_armv7a = "aarch32"
60JDK_ARCH_armv7ve = "aarch32"
diff --git a/recipes-core/openjdk/openjdk-8-release-aarch64.inc b/recipes-core/openjdk/openjdk-8-release-aarch64.inc
new file mode 100644
index 0000000..d08892d
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-release-aarch64.inc
@@ -0,0 +1,37 @@
1require openjdk-8-release-common.inc
2
3COMPATIBLE_HOST = "aarch64"
4
5CHANGESET_ID="b07"
6
7CORBA_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
8SRC_URI[corba.md5sum] = "d6dfd6f0c3bf4c6dc1f867dc7bcf8730"
9SRC_URI[corba.sha256sum] = "e80dae94f21ca9de2269bc9de72f1098d417e9f7d6ff69d047e26669e31b1bc4"
10
11HOTSPOT_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
12SRC_URI[hotspot.md5sum] = "44731f82f6e2a0697f414ae62f9eff54"
13SRC_URI[hotspot.sha256sum] = "3acb0bfa3eda0137e3c70ab10b59f139e0720116ed6ecf3f9c8633ebc36947b1"
14
15JAXP_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
16SRC_URI[jaxp.md5sum] = "7fb4207ba9277e109439101961223fc7"
17SRC_URI[jaxp.sha256sum] = "22616e56825c611c70968c34a229661d4cb910fdb0c3936ae3c75de2330abfb5"
18
19JAXWS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
20SRC_URI[jaxws.md5sum] = "a27379cbd6253408eee4aa0b8a551042"
21SRC_URI[jaxws.sha256sum] = "b6eb69d867694002284712a28058770170d885e6de6872cba260061d001b77ae"
22
23JDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
24SRC_URI[jdk.md5sum] = "2e64397ef1f35309aa7de00d46c2c751"
25SRC_URI[jdk.sha256sum] = "d470d24eddc314e5c30035881f3af6f0c48a3360accc0644ec26d9d32d9ea0e6"
26
27LANGTOOLS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
28SRC_URI[langtools.md5sum] = "71c2ce819538b0acc443c0519dfa43c1"
29SRC_URI[langtools.sha256sum] = "219919b7980d863cc26abd87341012f4802dd12a11a45f6627309ec365a9e838"
30
31NASHORN_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
32SRC_URI[nashorn.md5sum] = "6ee9418598ca411fe0b2339fa1a3a272"
33SRC_URI[nashorn.sha256sum] = "6d86c23301d2cbc1ea72474730336e089eb4c3d3014bdf0f3a9d3b5976a75f58"
34
35OPENJDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
36SRC_URI[openjdk.md5sum] = "188b5d7ef0976cfc1a4258d1dc8ccce0"
37SRC_URI[openjdk.sha256sum] = "7c32399a85f56bda2c740fc6834b8b5d648e75271a5376c2fa968bd713e3fec8"
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc
index f50b494..bd3092f 100644
--- a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc
+++ b/recipes-core/openjdk/openjdk-8-release-common.inc
@@ -1,61 +1,53 @@
1PATCHES_URI = "\ 1PATCHES_URI = "\
2 file://remove-shell-variables-from-autoheader.patch;striplevel=0 \ 2 file://0001-Allow-using-a-system-installed-libjpeg.patch \
3 file://filter-aclocal-copy-too.patch;striplevel=0 \ 3 file://0002-Allow-using-a-system-installed-libpng.patch \
4 file://dont-expect-fqpn-for-make.patch;striplevel=0 \ 4 file://0003-build-fix-build-on-as-needed-toolchains-generic.patch \
5 file://openjdk8-no-genx11-in-headless.patch;striplevel=0 \ 5 file://0004-don-t-expect-fqpn-for-make.patch \
6 file://openjdk8-no-unused-deps.patch;striplevel=0 \ 6 file://0005-autoconf-filter-aclocal-copy-too.patch \
7 file://openjdk8-find-compiler-fix-env-respect.patch;striplevel=0 \ 7 file://0006-autoconf-handle-extra-output.patch \
8 file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;striplevel=0 \ 8 file://0007-fix-assembler-flag-handling-in-makefile.patch \
9 file://0001-jdk-comparison-between-pointer-and-integer.patch \ 9 file://0008-autoconf-fix-shark-build-common.patch \
10 file://0002-hotspot-fix-compilation-with-security-flags-enabled.patch \ 10 file://0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch \
11 file://0003-jdk-Allow-using-a-system-installed-libjpeg.patch \ 11 file://0010-autoconf-remove-shell-variables-from-autoheader.patch \
12 file://0004-jdk-Allow-using-a-system-installed-libpng.patch \
13 file://0005-hotspot-use-correct-include-for-poll.patch \
14 file://0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \
15 file://0007-jdk-use-correct-include-for-poll.patch \
16 file://0008-jdk-use-correct-include-for-signal.patch \
17 file://0009-jdk-disable-backtrace-musl-build-fix.patch \
18 file://0010-build-fix-build-on-as-needed-toolchains-generic.patch \
19 file://0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \
20 ${HOTSPOT_UB_PATCH} \ 12 ${HOTSPOT_UB_PATCH} \
21 ${LIBPNG_NEON_PATCH} \ 13 file://2001-jdk-comparison-between-pointer-and-integer.patch \
22 file://handle_extra_output.patch \ 14 file://2002-jdk-Allow-using-a-system-installed-libjpeg.patch \
23 file://hotspot-handle-gcc7-format-overflow.patch \ 15 file://2003-jdk-Allow-using-a-system-installed-libpng.patch \
24 file://0001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \ 16 file://2004-jdk-use-correct-include-for-poll.patch \
17 file://2005-jdk-use-correct-include-for-signal.patch \
18 file://2006-jdk-disable-backtrace-musl-build-fix.patch \
19 file://2007-jdk-no-genx11-in-headless.patch \
20 file://2008-jdk-no-unused-deps.patch \
21 file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch \
25" 22"
26HOTSPOT_UB_PATCH = "\ 23HOTSPOT_UB_PATCH = "\
27 file://0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch \ 24 file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \
28 file://0015-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \ 25 file://1002-hotspot-use-correct-include-for-poll.patch \
29 file://0016-hotspot-Zero-build-requires-disabled-warnings.patch \ 26 file://1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \
30 file://0017-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ 27 file://1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \
31 file://0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch \ 28 file://1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \
32 file://0019-hotspot-Turn-on-the-Wreturn-type-warning.patch \ 29 file://1006-hotspot-Zero-build-requires-disabled-warnings.patch \
33 file://0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch \ 30 file://1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch \
31 file://1008-hotspot-Turn-on-the-Wreturn-type-warning.patch \
32 file://1009-hotspot-handle-format-error-for-GCC-7.patch \
33"
34HOTSPOT_UB_PATCH_append_class-target = "\
35 file://1010-hotspot-fix-adlc-flags.patch \
36 file://1011-hotspot-fix-shark-build-common.patch \
37 file://1012-hotspot-restrict-to-staging-dir.patch \
34" 38"
35HOTSPOT_UB_PATCH_prepend_aarch64 = "\ 39HOTSPOT_UB_PATCH_prepend_aarch64 = "\
36 file://0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch \ 40 file://aarch64-hotspot-Fix-further-functions-with-a-missing.patch \
37 file://0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch \
38" 41"
39HOTSPOT_UB_PATCH_append_armv7a = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" 42HOTSPOT_UB_PATCH_append_armv7a = " file://aarch32-hotspot-fix-missing-return-values.patch"
40HOTSPOT_UB_PATCH_append_armv7ve = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" 43HOTSPOT_UB_PATCH_append_armv7ve = " file://aarch32-hotspot-fix-missing-return-values.patch"
41# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch
42# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html
43# by Roman Kennke (rkennke at redhat.com)
44LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0"
45LIBPNG_NEON_PATCH_aarch64 = ""
46 44
47PATCHES_URI_append_class-target = "\ 45PATCHES_URI_append_class-target = "\
48 file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \
49 file://openjdk8-fix-shark-build-common.patch;striplevel=0 \
50 ${FIX_SHARK_BUILD_PT2_PATCH} \ 46 ${FIX_SHARK_BUILD_PT2_PATCH} \
51 file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \
52 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \
53 file://openjdk8-fix-adlc-flags.patch;striplevel=0 \
54 file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \
55" 47"
56FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0" 48FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0"
57FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" 49FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0"
58FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" 50FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0"
59 51
60PATCHES_URI_append_libc-musl = "\ 52PATCHES_URI_append_libc-musl = "\
61 ${OBSOLETE_ISNANF_PATCH} \ 53 ${OBSOLETE_ISNANF_PATCH} \
@@ -80,9 +72,14 @@ REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-
80REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" 72REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch"
81REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" 73REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch"
82 74
83PATCHES_URI_append_libc-musl_armv7a = " file://hotspot-remaining-musl-fixes-aarch32.patch" 75PATCHES_URI_append_libc-musl_armv7a = " file://aarch32-hotspot-remaining-musl-fixes.patch"
84PATCHES_URI_append_libc-musl_armv7ve = " file://hotspot-remaining-musl-fixes-aarch32.patch" 76PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch"
85PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" 77PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch"
78
79# remove aarch32 & aarch64 mainlined patches
80PATCHES_URI_remove_armv7a = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch"
81PATCHES_URI_remove_armv7ve = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch"
82PATCHES_URI_remove_aarch64 = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch"
86 83
87# Name of the directory containing the compiled output 84# Name of the directory containing the compiled output
88BUILD_DIR = "openjdk.build" 85BUILD_DIR = "openjdk.build"
@@ -111,7 +108,12 @@ OPENJDK_ARCH_PORT_aarch64 = "aarch64-port"
111OPENJDK_ARCH_PORT_armv7a = "aarch32-port" 108OPENJDK_ARCH_PORT_armv7a = "aarch32-port"
112OPENJDK_ARCH_PORT_armv7ve = "aarch32-port" 109OPENJDK_ARCH_PORT_armv7ve = "aarch32-port"
113OPENJDK_HG_U = "jdk8u" 110OPENJDK_HG_U = "jdk8u"
114OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" 111
112# the aarch64 port moved, for more information see:
113# https://mail.openjdk.java.net/pipermail/aarch64-port-dev/2018-August/006265.html
114OPENJDK_HG_U_aarch64 = "jdk8u-shenandoah"
115
116OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}"
115 117
116OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" 118OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2"
117OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}" 119OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}"
diff --git a/recipes-core/openjdk/openjdk-8-release.inc b/recipes-core/openjdk/openjdk-8-release.inc
new file mode 100644
index 0000000..170338f
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-release.inc
@@ -0,0 +1,39 @@
1require openjdk-8-release-common.inc
2
3# We do not yet work for aarch64, and we make sure
4# to use the aarch32 port for ARMv7.
5COMPATIBLE_HOST = "^(?!(aarch64)).*$"
6COMPATIBLE_HOST_armv7a = "^$"
7COMPATIBLE_HOST_armv7ve = "^$"
8
9CORBA_CHANGESET = "jdk8u${PV}-ga"
10SRC_URI[corba.md5sum] = "e269b1b01c00bec6c9f2684d7e3e6540"
11SRC_URI[corba.sha256sum] = "45433c179dd5ee117b8097c75f475feb5a2d2fae052be3e582c59511696a5d0e"
12
13HOTSPOT_CHANGESET = "jdk8u${PV}-ga"
14SRC_URI[hotspot.md5sum] = "105c2a6bdfecc2f1fe09aac65748bf47"
15SRC_URI[hotspot.sha256sum] = "08729033233b3a42bf1fa3d2a2c0cdf1c950c682cc27bd486f7c19ae28d34ef7"
16
17JAXP_CHANGESET = "jdk8u${PV}-ga"
18SRC_URI[jaxp.md5sum] = "a9fb321b6c466e83b9ad23da0d9674c5"
19SRC_URI[jaxp.sha256sum] = "8e52661976169fca3fe567b269be5852dff378cb2e66e9f8a4e9f40aaa8d89e4"
20
21JAXWS_CHANGESET = "jdk8u${PV}-ga"
22SRC_URI[jaxws.md5sum] = "6ee14ea4974b93bff075499cd820413b"
23SRC_URI[jaxws.sha256sum] = "95a14275db59e0c1a8fa4ca4861b8761b1598f0ed7f3ef2f2cef7c619df1eb83"
24
25JDK_CHANGESET = "jdk8u${PV}-ga"
26SRC_URI[jdk.md5sum] = "57d2bc331d9506fa652fac686c6b64c1"
27SRC_URI[jdk.sha256sum] = "3ecb62288df04d05f541a26da32464c04558a951b2962290f08b149d614ae020"
28
29LANGTOOLS_CHANGESET = "jdk8u${PV}-ga"
30SRC_URI[langtools.md5sum] = "5456b86c13a21c8e73a088af5723ba06"
31SRC_URI[langtools.sha256sum] = "ffaf18753935cd03b2d581f17789172f4cfdc093d62ca764bf14068d7e30599c"
32
33NASHORN_CHANGESET = "jdk8u${PV}-ga"
34SRC_URI[nashorn.md5sum] = "0716fb438451ac45285a0cd8c17cc27b"
35SRC_URI[nashorn.sha256sum] = "3a572a5d5c2e8b590c9ac2c65905069a991f7e168f5bbe15e7dbb924b10ab96d"
36
37OPENJDK_CHANGESET = "jdk8u${PV}-ga"
38SRC_URI[openjdk.md5sum] = "5f5cf2638bba1b4f9b4915be9973077e"
39SRC_URI[openjdk.sha256sum] = "633f1d20d4d8d36fea1680140b5514ab153096a19c306b812fbbd19314c8dece"
diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb b/recipes-core/openjdk/openjdk-8_242.bb
index 72f208e..bc6ce51 100644
--- a/recipes-core/openjdk/openjdk-8_172b11.bb
+++ b/recipes-core/openjdk/openjdk-8_242.bb
@@ -2,7 +2,7 @@ INC_FILE_SUFFIX = ""
2INC_FILE_SUFFIX_aarch64 = "-aarch64" 2INC_FILE_SUFFIX_aarch64 = "-aarch64"
3INC_FILE_SUFFIX_armv7a = "-aarch32" 3INC_FILE_SUFFIX_armv7a = "-aarch32"
4INC_FILE_SUFFIX_armv7ve = "-aarch32" 4INC_FILE_SUFFIX_armv7ve = "-aarch32"
5require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc 5require openjdk-8-release${INC_FILE_SUFFIX}.inc
6require openjdk-8-cross.inc 6require openjdk-8-cross.inc
7 7
8do_install() { 8do_install() {
@@ -11,7 +11,7 @@ do_install() {
11 cp -rp ${B}/images/j2sdk-image/* ${D}${JDK_HOME} 11 cp -rp ${B}/images/j2sdk-image/* ${D}${JDK_HOME}
12 chown -R root:root ${D}${JDK_HOME} 12 chown -R root:root ${D}${JDK_HOME}
13 install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ 13 install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/
14 find ${D}${JDK_HOME} -name "*.debuginfo" -print0 | xargs -0 rm 14 find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \;
15} 15}
16 16
17PACKAGES_append = " \ 17PACKAGES_append = " \
diff --git a/recipes-core/openjdk/openjre-8_172b11.bb b/recipes-core/openjdk/openjre-8_242.bb
index e9b930b..ce6392a 100644
--- a/recipes-core/openjdk/openjre-8_172b11.bb
+++ b/recipes-core/openjdk/openjre-8_242.bb
@@ -2,7 +2,7 @@ INC_FILE_SUFFIX = ""
2INC_FILE_SUFFIX_aarch64 = "-aarch64" 2INC_FILE_SUFFIX_aarch64 = "-aarch64"
3INC_FILE_SUFFIX_armv7a = "-aarch32" 3INC_FILE_SUFFIX_armv7a = "-aarch32"
4INC_FILE_SUFFIX_armv7ve = "-aarch32" 4INC_FILE_SUFFIX_armv7ve = "-aarch32"
5require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc 5require openjdk-8-release${INC_FILE_SUFFIX}.inc
6require openjdk-8-cross.inc 6require openjdk-8-cross.inc
7 7
8do_install() { 8do_install() {
@@ -11,7 +11,6 @@ do_install() {
11 cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME} 11 cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME}
12 chown -R root:root ${D}${JRE_HOME} 12 chown -R root:root ${D}${JRE_HOME}
13 install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ 13 install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/
14 find ${D}${JRE_HOME} -name "*.debuginfo" -print0 | xargs -0 rm
15} 14}
16 15
17FILES_${PN}_append = "\ 16FILES_${PN}_append = "\
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch
new file mode 100644
index 0000000..e9662eb
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch
@@ -0,0 +1,77 @@
1From 836aad60652299a26341b46a4a9a2e6c418b6947 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 13:36:53 +0000
4Subject: [PATCH 01/10] Allow using a system-installed libjpeg
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Patch stolen (and some typos corrected) from debian patch,
10which itself was a backport from:
11 http://hg.openjdk.java.net/jdk9/client/rev/bfd9a3e1aeb5
12 http://hg.openjdk.java.net/jdk9/client/jdk/rev/320743f0b4fc
13
14Issues fixed on top of debian patch:
15 * imageIOJPEG.c -> imageioJPEG.c
16 * $(LIBJPEG_LIBS) must be added to LDFLAGS_SUFFIX, not
17 LDFLAGS as it otherwise doesn't make it into the linker
18 command line and then fails when using -Wl,-z,now in
19 LDFLAGS (as done when 'security' is enabled)
20
21Upstream-Status: Backport
22
23Signed-off-by: André Draszik <andre.draszik@jci.com>
24Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
25---
26 common/autoconf/libraries.m4 | 35 ++++++++++++++++++++++++++++++-----
27 1 file changed, 30 insertions(+), 5 deletions(-)
28
29diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
30index 6d803f9..d2732eb 100644
31--- a/common/autoconf/libraries.m4
32+++ b/common/autoconf/libraries.m4
33@@ -774,11 +774,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
34 # Check for the jpeg library
35 #
36
37- USE_EXTERNAL_LIBJPEG=true
38- AC_CHECK_LIB(jpeg, main, [],
39- [ USE_EXTERNAL_LIBJPEG=false
40- AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
41- ])
42+ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
43+ [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
44+
45+ AC_MSG_CHECKING([for which libjpeg to use])
46+
47+ # default is bundled
48+ DEFAULT_LIBJPEG=bundled
49+
50+ #
51+ # if user didn't specify, use DEFAULT_LIBJPEG
52+ #
53+ if test "x${with_libjpeg}" = "x"; then
54+ with_libjpeg=${DEFAULT_LIBJPEG}
55+ fi
56+
57+ AC_MSG_RESULT(${with_libjpeg})
58+
59+ if test "x${with_libjpeg}" = "xbundled"; then
60+ USE_EXTERNAL_LIBJPEG=false
61+ elif test "x${with_libjpeg}" = "xsystem"; then
62+ AC_CHECK_HEADER(jpeglib.h, [],
63+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])])
64+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [],
65+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])])
66+
67+ USE_EXTERNAL_LIBJPEG=true
68+ else
69+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
70+ fi
71+
72 AC_SUBST(USE_EXTERNAL_LIBJPEG)
73
74 ###############################################################################
75--
762.24.1
77
diff --git a/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch
new file mode 100644
index 0000000..ed8ecfa
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch
@@ -0,0 +1,80 @@
1From ed79dc49323cc08e81b3699817825f66b1af0ce2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Thu, 2 Jan 2020 13:40:50 +0100
4Subject: [PATCH 02/10] Allow using a system-installed libpng
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Patch stolen (and some typos corrected) from debian patch,
10which itself was a backport from:
11 http://hg.openjdk.java.net/jdk9/jdk9/rev/bfc1c131e540
12 http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/5e503831b142
13
14Issues fixed on top of debian patch:
15 * the default when --with-libpng= is not given works
16 * using the bundled libpng works
17
18Upstream-Status: Backport
19
20Signed-off-by: André Draszik <andre.draszik@jci.com>
21Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
22---
23 common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++++++++++++++++
24 1 file changed, 41 insertions(+)
25
26diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
27index d2732eb..727f018 100644
28--- a/common/autoconf/libraries.m4
29+++ b/common/autoconf/libraries.m4
30@@ -843,6 +843,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
31 fi
32 AC_SUBST(USE_EXTERNAL_LIBGIF)
33
34+ ###############################################################################
35+ #
36+ # Check for the png library
37+ #
38+
39+ AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
40+ [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
41+
42+ AC_CHECK_LIB(png, png_sig_cmp,
43+ [ LIBPNG_FOUND=yes ],
44+ [ LIBPNG_FOUND=no ])
45+
46+ AC_MSG_CHECKING([for which libpng to use])
47+
48+ # default is bundled
49+ DEFAULT_LIBPNG=bundled
50+
51+ #
52+ # if user didn't specify, use DEFAULT_LIBPNG
53+ #
54+ if test "x${with_libpng}" = "x"; then
55+ with_libpng=${DEFAULT_LIBPNG}
56+ fi
57+
58+
59+ if test "x${with_libpng}" = "xbundled"; then
60+ USE_EXTERNAL_LIBPNG=false
61+ AC_MSG_RESULT([bundled])
62+ elif test "x${with_libpng}" = "xsystem"; then
63+ if test "x${LIBPNG_FOUND}" = "xyes"; then
64+ USE_EXTERNAL_LIBPNG=true
65+ AC_MSG_RESULT([system])
66+ else
67+ AC_MSG_RESULT([system not found])
68+ AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
69+ fi
70+ else
71+ AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
72+ fi
73+ AC_SUBST(USE_EXTERNAL_LIBPNG)
74+
75 ###############################################################################
76 #
77 # Check for the zlib library
78--
792.24.1
80
diff --git a/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch b/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch
deleted file mode 100644
index a94e90f..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0002-hotspot-fix-compilation-with-security-flags-enabled.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From bdea8cf299313388ec41ea20281deca6dc4f764d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 14:41:06 +0000
4Subject: [PATCH 2/9] hotspot: fix compilation with security flags enabled
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9| hotspot/src/share/vm/code/dependencies.cpp: In function 'static void Dependencies::write_dependency_to(xmlStream*, Dependencies::DepType, GrowableArray<Dependencies::DepArgument>*, Klass*)':
10| hotspot/src/share/vm/code/dependencies.cpp:498:6: error: '%d' directive writing between 1 and 10 bytes into a region of size 9 [-Werror=format-overflow=]
11| void Dependencies::write_dependency_to(xmlStream* xtty,
12| ^~~~~~~~~~~~
13| hotspot/src/share/vm/code/dependencies.cpp:498:6: note: directive argument in the range [0, 2147483647]
14| hotspot/src/share/vm/code/dependencies.cpp:528:27: note: 'sprintf' output between 3 and 12 bytes into a destination of size 10
15| char xn[10]; sprintf(xn, "x%d", j);
16| ~~~~~~~^~~~~~~~~~~~~~
17
18Backport a patch to fix this.
19
20Upstream-Status: Backport [http://hg.openjdk.java.net/jdk10/jdk10/hotspot/rev/eb11b3f0ae65]
21Signed-off-by: André Draszik <andre.draszik@jci.com>
22---
23 hotspot/src/share/vm/code/dependencies.cpp | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/hotspot/src/share/vm/code/dependencies.cpp b/hotspot/src/share/vm/code/dependencies.cpp
27index 7317036d..c71d921d 100644
28--- a/hotspot/src/share/vm/code/dependencies.cpp
29+++ b/hotspot/src/share/vm/code/dependencies.cpp
30@@ -525,7 +525,7 @@ void Dependencies::write_dependency_to(xmlStream* xtty,
31 xtty->object("x", arg.metadata_value());
32 }
33 } else {
34- char xn[10]; sprintf(xn, "x%d", j);
35+ char xn[12]; sprintf(xn, "x%d", j);
36 if (arg.is_oop()) {
37 xtty->object(xn, arg.oop_value());
38 } else {
39--
402.16.2
41
diff --git a/recipes-core/openjdk/patches-openjdk-8/0010-build-fix-build-on-as-needed-toolchains-generic.patch b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch
index 2d02b7c..0e3359c 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0010-build-fix-build-on-as-needed-toolchains-generic.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch
@@ -1,7 +1,7 @@
1From 84bcdb9cdab0e0be9cdfededfb518d3cea9009e3 Mon Sep 17 00:00:00 2001 1From 4cde9ea2adf8c57168a299f11625083d1822b0de Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 12 Mar 2018 15:40:58 +0000 3Date: Mon, 12 Mar 2018 15:40:58 +0000
4Subject: [PATCH] build: fix build on --as-needed toolchains (generic) 4Subject: [PATCH 03/10] build: fix build on --as-needed toolchains (generic)
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -65,16 +65,16 @@ any additional libraries, so as to fix this once and for
65all. 65all.
66 66
67Signed-off-by: André Draszik <andre.draszik@jci.com> 67Signed-off-by: André Draszik <andre.draszik@jci.com>
68Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
68--- 69---
69Upstream-Status: Pending
70 make/common/NativeCompilation.gmk | 5 ++--- 70 make/common/NativeCompilation.gmk | 5 ++---
71 1 file changed, 2 insertions(+), 3 deletions(-) 71 1 file changed, 2 insertions(+), 3 deletions(-)
72 72
73diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk 73diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
74index e7ea22ce..79f081fd 100644 74index d961cf3..92f8033 100644
75--- a/make/common/NativeCompilation.gmk 75--- a/make/common/NativeCompilation.gmk
76+++ b/make/common/NativeCompilation.gmk 76+++ b/make/common/NativeCompilation.gmk
77@@ -477,9 +477,8 @@ define SetupNativeCompilation 77@@ -618,9 +618,8 @@ endif # no MacOS X support yet
78 78
79 $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) 79 $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST)
80 $$(call LINKING_EXE_MSG,$$($1_BASENAME)) 80 $$(call LINKING_EXE_MSG,$$($1_BASENAME))
@@ -87,5 +87,5 @@ index e7ea22ce..79f081fd 100644
87 $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 87 $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
88 endif 88 endif
89-- 89--
902.16.2 902.24.1
91 91
diff --git a/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch
index 5192d1a..db00b24 100644
--- a/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch
@@ -1,6 +1,18 @@
1--- common/autoconf/basics.m4.orig 1From f4c93547119c7550626e1b2ae2b750ea4f83b3fe Mon Sep 17 00:00:00 2001
2+++ common/autoconf/basics.m4 2From: Jens Rehsack <rehsack@gmail.com>
3@@ -555,10 +555,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], 3Date: Thu, 2 Jan 2020 13:42:43 +0100
4Subject: [PATCH 04/10] don't expect fqpn for make
5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7---
8 common/autoconf/basics.m4 | 8 +++++---
9 1 file changed, 5 insertions(+), 3 deletions(-)
10
11diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
12index 4ee9cdd..c20ea76 100644
13--- a/common/autoconf/basics.m4
14+++ b/common/autoconf/basics.m4
15@@ -740,10 +740,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE],
4 # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. 16 # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
5 if test "x$MAKE" != x; then 17 if test "x$MAKE" != x; then
6 # User has supplied a make, test it. 18 # User has supplied a make, test it.
@@ -16,3 +28,6 @@
16 if test "x$FOUND_MAKE" = x; then 28 if test "x$FOUND_MAKE" = x; then
17 AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.]) 29 AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.])
18 fi 30 fi
31--
322.24.1
33
diff --git a/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch
deleted file mode 100644
index 658ba32..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0004-jdk-Allow-using-a-system-installed-libpng.patch
+++ /dev/null
@@ -1,148 +0,0 @@
1From 549100e3e687d2c844eeebe22a7dcbf7ed50406e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 13:43:04 +0000
4Subject: [PATCH 4/9] jdk: Allow using a system-installed libpng
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Patch stolen (and some typos corrected) from debian patch,
10which itself was a backport from:
11 http://hg.openjdk.java.net/jdk9/jdk9/rev/bfc1c131e540
12 http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/5e503831b142
13
14Issues fixed on top of debian patch:
15 * the default when --with-libpng= is not given works
16 * using the bundled libpng works
17
18Upstream-Status: Backport
19Signed-off-by: André Draszik <andre.draszik@jci.com>
20---
21 common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++
22 common/autoconf/spec.gmk.in | 1 +
23 jdk/make/lib/Awt2dLibraries.gmk | 12 +++++--
24 .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-
25 4 files changed, 52 insertions(+), 5 deletions(-)
26
27diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
28index 3f5f69b1..e419a050 100644
29--- a/common/autoconf/libraries.m4
30+++ b/common/autoconf/libraries.m4
31@@ -664,6 +664,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
32 fi
33 AC_SUBST(USE_EXTERNAL_LIBGIF)
34
35+ ###############################################################################
36+ #
37+ # Check for the png library
38+ #
39+
40+ AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
41+ [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
42+
43+ AC_CHECK_LIB(png, png_sig_cmp,
44+ [ LIBPNG_FOUND=yes ],
45+ [ LIBPNG_FOUND=no ])
46+
47+ AC_MSG_CHECKING([for which libpng to use])
48+
49+ # default is bundled
50+ DEFAULT_LIBPNG=bundled
51+
52+ #
53+ # if user didn't specify, use DEFAULT_LIBPNG
54+ #
55+ if test "x${with_libpng}" = "x"; then
56+ with_libpng=${DEFAULT_LIBPNG}
57+ fi
58+
59+
60+ if test "x${with_libpng}" = "xbundled"; then
61+ USE_EXTERNAL_LIBPNG=false
62+ AC_MSG_RESULT([bundled])
63+ elif test "x${with_libpng}" = "xsystem"; then
64+ if test "x${LIBPNG_FOUND}" = "xyes"; then
65+ USE_EXTERNAL_LIBPNG=true
66+ AC_MSG_RESULT([system])
67+ else
68+ AC_MSG_RESULT([system not found])
69+ AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
70+ fi
71+ else
72+ AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
73+ fi
74+ AC_SUBST(USE_EXTERNAL_LIBPNG)
75+
76 ###############################################################################
77 #
78 # Check for the zlib library
79diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
80index 1c418f29..2c802c0a 100644
81--- a/common/autoconf/spec.gmk.in
82+++ b/common/autoconf/spec.gmk.in
83@@ -567,6 +567,7 @@ endif
84 ENABLE_JFR=@ENABLE_JFR@
85 ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
86 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
87+USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
88 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
89 USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
90 LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
91diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
92index 8872a8e8..c577951a 100644
93--- a/jdk/make/lib/Awt2dLibraries.gmk
94+++ b/jdk/make/lib/Awt2dLibraries.gmk
95@@ -1219,7 +1219,6 @@ endif
96 ifndef BUILD_HEADLESS_ONLY
97 LIBSPLASHSCREEN_DIRS := \
98 $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
99- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
100 $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
101
102 ifeq ($(USE_EXTERNAL_LIBGIF), true)
103@@ -1236,6 +1235,13 @@ ifndef BUILD_HEADLESS_ONLY
104 LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
105 endif
106
107+ ifeq ($(USE_EXTERNAL_LIBPNG), true)
108+ LIBPNG_LDFLAGS := -lpng
109+ else
110+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/libpng
111+ LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng
112+ endif
113+
114 ifneq ($(OPENJDK_TARGET_OS), macosx)
115 LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
116 else
117@@ -1297,12 +1303,12 @@ ifndef BUILD_HEADLESS_ONLY
118 LANG := C, \
119 OPTIMIZATION := LOW, \
120 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
121- $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
122+ $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS), \
123 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
124 LDFLAGS := $(LDFLAGS_JDKLIB) \
125 $(call SET_SHARED_LIBRARY_ORIGIN), \
126 LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
127- $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
128+ $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \
129 LDFLAGS_SUFFIX_solaris := -lc, \
130 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
131 RC_FLAGS := $(RC_FLAGS) \
132diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
133index 3599433e..5bf002ea 100644
134--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
135+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
136@@ -25,8 +25,7 @@
137
138 #include "splashscreen_impl.h"
139
140-#include "../libpng/png.h"
141-
142+#include <png.h>
143 #include <setjmp.h>
144
145 #define SIG_BYTES 8
146--
1472.16.2
148
diff --git a/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch b/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch
new file mode 100644
index 0000000..262f0b7
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch
@@ -0,0 +1,25 @@
1From b8bab47b58be4a0102011825c2ee3dd2c6427d08 Mon Sep 17 00:00:00 2001
2From: Jens Rehsack <rehsack@gmail.com>
3Date: Thu, 2 Jan 2020 13:44:25 +0100
4Subject: [PATCH 05/10] autoconf: filter aclocal copy too
5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7---
8 common/autoconf/basics.m4 | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
12index c20ea76..8e06cd2 100644
13--- a/common/autoconf/basics.m4
14+++ b/common/autoconf/basics.m4
15@@ -636,6 +636,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
16 | $SED -e 's/config.log//g' \
17 -e 's/confdefs.h//g' \
18 -e 's/fixpath.exe//g' \
19+ -e 's,aclocal-copy,,g' \
20 -e 's/ //g' \
21 | $TR -d '\n'`
22 if test "x$filtered_files" != x; then
23--
242.24.1
25
diff --git a/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch
index a8d2786..c5fa4bf 100644
--- a/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch
@@ -1,9 +1,21 @@
1From cf40c00dfd6d2299055c0e8415525d2da5e7cd4a Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Thu, 2 Jan 2020 13:45:42 +0100
4Subject: [PATCH 06/10] autoconf: handle extra output
5
1When adding the environment variable JAVA_TOOL_OPTIONS an extra line 6When adding the environment variable JAVA_TOOL_OPTIONS an extra line
2in the output from 'java -version' is produced. As this output is 7in the output from 'java -version' is produced. As this output is
3parsed by configure script the extra line has to be filtered out. 8parsed by configure script the extra line has to be filtered out.
4 9
5--- jdk8u-4be07cb28b21.orig/common/autoconf/boot-jdk.m4 10Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
6+++ jdk8u-4be07cb28b21/common/autoconf/boot-jdk.m4 11---
12 common/autoconf/boot-jdk.m4 | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4
16index 5be15b8..0d1a6e1 100644
17--- a/common/autoconf/boot-jdk.m4
18+++ b/common/autoconf/boot-jdk.m4
7@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], 19@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
8 BOOT_JDK_FOUND=no 20 BOOT_JDK_FOUND=no
9 else 21 else
@@ -13,3 +25,6 @@ parsed by configure script the extra line has to be filtered out.
13 25
14 # Extra M4 quote needed to protect [] in grep expression. 26 # Extra M4 quote needed to protect [] in grep expression.
15 [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] 27 [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`]
28--
292.24.1
30
diff --git a/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch
new file mode 100644
index 0000000..c99d599
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch
@@ -0,0 +1,36 @@
1From ec3aa8ae1159ff5ef37fae1ba470cf1886aa8d79 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com>
3Date: Thu, 2 Jan 2020 13:49:02 +0100
4Subject: [PATCH 07/10] fix assembler flag handling in makefile
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Delay $CXX insertion until after make has evaluated the comma-separated
10list, as any comma separated parameters in CXX (such as assembler arguments)
11would break the build
12
13Upstream-Status: Pending
14
15Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
16Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
17---
18 make/common/NativeCompilation.gmk | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
22index 92f8033..46a1be9 100644
23--- a/make/common/NativeCompilation.gmk
24+++ b/make/common/NativeCompilation.gmk
25@@ -391,7 +391,7 @@ define SetupNativeCompilation
26 $$(foreach p,$$($1_SRCS), \
27 $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
28 $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
29- $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
30+ $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$$(CXX),$$($1_ASFLAGS))))
31
32 # On windows we need to create a resource file
33 ifeq ($(OPENJDK_TARGET_OS), windows)
34--
352.24.1
36
diff --git a/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch
new file mode 100644
index 0000000..b783613
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch
@@ -0,0 +1,37 @@
1From c530da1c0269d1e9a875670943446876227fdb71 Mon Sep 17 00:00:00 2001
2From: Jens Rehsack <rehsack@gmail.com>
3Date: Thu, 2 Jan 2020 13:51:40 +0100
4Subject: [PATCH 08/10] autoconf: fix shark build (common)
5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7---
8 common/autoconf/libraries.m4 | 5 +++--
9 1 file changed, 3 insertions(+), 2 deletions(-)
10
11diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
12index 727f018..91d2b5c 100644
13--- a/common/autoconf/libraries.m4
14+++ b/common/autoconf/libraries.m4
15@@ -1079,8 +1079,9 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
16 fi
17 fi
18 done
19- llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//')
20+ llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//; s/\..*$//')
21 LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}"
22+ AS_IF([test $llvm_version -ge 34], [LLVM_CFLAGS="${LLVM_CFLAGS} -std=gnu++11"])
23
24 unset LLVM_LDFLAGS
25 for flag in $("${LLVM_CONFIG}" --ldflags); do
26@@ -1093,7 +1094,7 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
27 done
28
29 unset LLVM_LIBS
30- for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do
31+ for flag in $("${LLVM_CONFIG}" --libs --system-libs ${llvm_components}); do
32 if echo "${flag}" | grep -q '^-l'; then
33 if test "${LLVM_LIBS}" != ""; then
34 LLVM_LIBS="${LLVM_LIBS} "
35--
362.24.1
37
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch
index 7d340a8..14fccd1 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch
@@ -1,40 +1,59 @@
1--- make/common/NativeCompilation.gmk.orig 1From a5f2646a9dd0f7191e9e0aa5eba5fdd9d70d1671 Mon Sep 17 00:00:00 2001
2+++ make/common/NativeCompilation.gmk 2From: Jens Rehsack <rehsack@gmail.com>
3@@ -438,58 +438,6 @@ define SetupNativeCompilation 3Date: Thu, 2 Jan 2020 13:53:50 +0100
4 $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% 4Subject: [PATCH 09/10] prevent debuginfo in favour of openembedded package
5 split
6
7Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
8---
9 make/common/NativeCompilation.gmk | 122 ------------------------------
10 1 file changed, 122 deletions(-)
11
12diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
13index 46a1be9..b4ea2c6 100644
14--- a/make/common/NativeCompilation.gmk
15+++ b/make/common/NativeCompilation.gmk
16@@ -456,67 +456,6 @@ define SetupNativeCompilation
5 $(CP) $$< $$@ 17 $(CP) $$< $$@
6 endif 18 endif
7- 19
8- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X 20- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
9- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows 21- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
10- ifeq ($(OPENJDK_TARGET_OS), solaris) 22- ifeq ($(OPENJDK_TARGET_OS), solaris)
11- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 23- ifneq ($$($1_STRIP_POLICY), no_strip)
12- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from 24- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
13- # empty section headers until a fixed $(OBJCOPY) is available. 25- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
14- # An empty section header has sh_addr == 0 and sh_size == 0. 26- # empty section headers until a fixed $(OBJCOPY) is available.
15- # This problem has only been seen on Solaris X64, but we call this tool 27- # An empty section header has sh_addr == 0 and sh_size == 0.
16- # on all Solaris builds just in case. 28- # This problem has only been seen on Solaris X64, but we call this tool
17- # 29- # on all Solaris builds just in case.
18- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 30- #
19- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. 31- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
20- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \ 32- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
33- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
21- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) 34- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
22- $(RM) $$@ 35- $(RM) $$@
23- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< 36- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
24- $(OBJCOPY) --only-keep-debug $$< $$@ 37- $(OBJCOPY) --only-keep-debug $$< $$@
25- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< 38- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
39- endif
26- else # not solaris 40- else # not solaris
27- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) 41- ifneq ($$($1_STRIP_POLICY), no_strip)
42- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
28- $(RM) $$@ 43- $(RM) $$@
29- $(OBJCOPY) --only-keep-debug $$< $$@ 44- $(OBJCOPY) --only-keep-debug $$< $$@
30- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< 45- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
46- endif
31- endif # Touch to not retrigger rule on rebuild 47- endif # Touch to not retrigger rule on rebuild
48- ifneq ($$($1_STRIP_POLICY), no_strip)
32- $(TOUCH) $$@ 49- $(TOUCH) $$@
50- endif
33- endif # !windows 51- endif # !windows
34- endif # !macosx 52- endif # !macosx
35- 53-
36- ifeq ($(ZIP_DEBUGINFO_FILES), true) 54- ifeq ($(ZIP_DEBUGINFO_FILES), true)
37-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet 55-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
56-ifneq ($$($1_STRIP_POLICY), no_strip)
38- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz 57- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
39- 58-
40- ifeq ($(OPENJDK_TARGET_OS), windows) 59- ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -47,53 +66,62 @@
47- $(CD) $$($1_OBJECT_DIR) \ 66- $(CD) $$($1_OBJECT_DIR) \
48- && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo 67- && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
49- endif 68- endif
69-endif # not possible when stripping is disabled
50-endif # no MacOS X support yet 70-endif # no MacOS X support yet
51- else 71- else
52- ifeq ($(OPENJDK_TARGET_OS), windows) 72- ifeq ($(OPENJDK_TARGET_OS), windows)
53- $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \ 73- $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
54- $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb 74- $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
55- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files 75- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
56- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo 76- ifneq ($$($1_STRIP_POLICY), no_strip)
77- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
78- endif
57- endif 79- endif
58- endif 80- endif
59 endif 81 endif
60 endif 82 endif
61 83
62@@ -522,58 +470,6 @@ endif # no MacOS X support yet 84@@ -550,67 +489,6 @@ endif # no MacOS X support yet
63 $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
64 $(CP) $$< $$@ 85 $(CP) $$< $$@
65 endif 86 endif
66- 87
67- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X 88- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
68- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows 89- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
69- ifeq ($(OPENJDK_TARGET_OS), solaris) 90- ifeq ($(OPENJDK_TARGET_OS), solaris)
70- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 91- ifneq ($$($1_STRIP_POLICY), no_strip)
71- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from 92- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
72- # empty section headers until a fixed $(OBJCOPY) is available. 93- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
73- # An empty section header has sh_addr == 0 and sh_size == 0. 94- # empty section headers until a fixed $(OBJCOPY) is available.
74- # This problem has only been seen on Solaris X64, but we call this tool 95- # An empty section header has sh_addr == 0 and sh_size == 0.
75- # on all Solaris builds just in case. 96- # This problem has only been seen on Solaris X64, but we call this tool
76- # 97- # on all Solaris builds just in case.
77- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 98- #
78- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. 99- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
79- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \ 100- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
101- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
80- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) 102- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
81- $(RM) $$@ 103- $(RM) $$@
82- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< 104- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
83- $(OBJCOPY) --only-keep-debug $$< $$@ 105- $(OBJCOPY) --only-keep-debug $$< $$@
84- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< 106- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
107- endif
85- else # not solaris 108- else # not solaris
86- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) 109- ifneq ($$($1_STRIP_POLICY), no_strip)
110- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
87- $(RM) $$@ 111- $(RM) $$@
88- $(OBJCOPY) --only-keep-debug $$< $$@ 112- $(OBJCOPY) --only-keep-debug $$< $$@
89- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< 113- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
114- endif
90- endif 115- endif
116- ifneq ($$($1_STRIP_POLICY), no_strip)
91- $(TOUCH) $$@ 117- $(TOUCH) $$@
118- endif
92- endif # !windows 119- endif # !windows
93- endif # !macosx 120- endif # !macosx
94- 121-
95- ifeq ($(ZIP_DEBUGINFO_FILES), true) 122- ifeq ($(ZIP_DEBUGINFO_FILES), true)
96-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet 123-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
124-ifneq ($$($1_STRIP_POLICY), no_strip)
97- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz 125- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
98- 126-
99- ifeq ($(OPENJDK_TARGET_OS), windows) 127- ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -106,15 +134,21 @@
106- $(CD) $$($1_OBJECT_DIR) \ 134- $(CD) $$($1_OBJECT_DIR) \
107- && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo 135- && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
108- endif 136- endif
137-endif
109-endif # no MacOS X support yet 138-endif # no MacOS X support yet
110- else 139- else
111- ifeq ($(OPENJDK_TARGET_OS), windows) 140- ifeq ($(OPENJDK_TARGET_OS), windows)
112- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \ 141- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
113- $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb 142- $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
114- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files 143- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
115- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo 144- ifneq ($$($1_STRIP_POLICY), no_strip)
145- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
146- endif
116- endif 147- endif
117- endif 148- endif
118 endif 149 endif
119 endif 150 endif
120 151
152--
1532.24.1
154
diff --git a/recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch
index 5e2f78b..57099ec 100644
--- a/recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch
@@ -1,6 +1,18 @@
1--- common/autoconf/basics.m4.orig 1From 0d22dccb4de73d274b90e2647702b92958374bc1 Mon Sep 17 00:00:00 2001
2+++ common/autoconf/basics.m4 2From: Jens Rehsack <rehsack@gmail.com>
3@@ -472,21 +472,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], 3Date: Thu, 2 Jan 2020 13:55:29 +0100
4Subject: [PATCH 10/10] autoconf: remove shell variables from autoheader
5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7---
8 common/autoconf/basics.m4 | 14 +++++++-------
9 1 file changed, 7 insertions(+), 7 deletions(-)
10
11diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
12index 8e06cd2..c220bba 100644
13--- a/common/autoconf/basics.m4
14+++ b/common/autoconf/basics.m4
15@@ -661,21 +661,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
4 AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) 16 AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
5 17
6 # Most of the probed defines are put into config.h 18 # Most of the probed defines are put into config.h
@@ -26,6 +38,9 @@
26 # which will look for generated configurations 38 # which will look for generated configurations
27- AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) 39- AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in])
28+ AC_CONFIG_FILES([Makefile:Makefile.in]) 40+ AC_CONFIG_FILES([Makefile:Makefile.in])
41 ])
29 42
30 # Save the arguments given to us 43 AC_DEFUN_ONCE([BASIC_SETUP_LOGGING],
31 echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments 44--
452.24.1
46
diff --git a/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch
new file mode 100644
index 0000000..f1de194
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch
@@ -0,0 +1,43 @@
1diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
2index e3a82c8..705e3e7 100644
3--- a/common/autoconf/toolchain.m4
4+++ b/common/autoconf/toolchain.m4
5@@ -478,23 +478,30 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
6 SEARCH_LIST="$3"
7
8 if test "x[$]$1" != x; then
9+ # split compiler program and arguments
10+ CBIN=`cut -d ' ' -f1 <<<"[$]$1"`
11+ CARGS=`cut -d ' ' -f2- <<<"[$]$1"`
12+
13 # User has supplied compiler name already, always let that override.
14- AC_MSG_NOTICE([Will use user supplied compiler $1=[$]$1])
15- if test "x`basename [$]$1`" = "x[$]$1"; then
16+ AC_MSG_NOTICE([Will use user supplied compiler ($CBIN) $1=[$]$1])
17+ if test "x`basename $CBIN`" = "x$CBIN"; then
18 # A command without a complete path is provided, search $PATH.
19
20- AC_PATH_PROGS(POTENTIAL_$1, [$]$1)
21- if test "x$POTENTIAL_$1" != x; then
22- $1=$POTENTIAL_$1
23+ AC_PATH_PROGS(POTENTIAL_CBIN, $CBIN)
24+ if test "x$POTENTIAL_CBIN" != x; then
25+ CBIN=$POTENTIAL_CBIN
26 else
27- AC_MSG_ERROR([User supplied compiler $1=[$]$1 could not be found])
28+ AC_MSG_ERROR([User supplied compiler $1=$CBIN could not be found])
29 fi
30 else
31 # Otherwise it might already be a complete path
32- if test ! -x "[$]$1"; then
33- AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist])
34+ if test ! -x "$CBIN"; then
35+ AC_MSG_ERROR([User supplied compiler $1=$CBIN does not exist])
36 fi
37 fi
38+
39+ $1="$CBIN $CARGS"
40+ AC_MSG_NOTICE([Mapped user supplied compiler to $1=[$]$1])
41 else
42 # No user supplied value. Locate compiler ourselves.
43
diff --git a/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch b/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch
new file mode 100644
index 0000000..39179d4
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0012-autoconf-NativeCompilation-remove-sysroot.patch
@@ -0,0 +1,24 @@
1diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
2index d961cf3..9679f97 100644
3--- a/make/common/NativeCompilation.gmk
4+++ b/make/common/NativeCompilation.gmk
5@@ -383,10 +383,6 @@ define SetupNativeCompilation
6 $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
7 endif
8
9- # Add sys root specific cflags last
10- $1_EXTRA_CFLAGS += $(SYSROOT_CFLAGS)
11- $1_EXTRA_CXXFLAGS += $(SYSROOT_CFLAGS)
12-
13 # Now call add_native_source for each source file we are going to compile.
14 $$(foreach p,$$($1_SRCS), \
15 $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
16@@ -432,8 +428,6 @@ define SetupNativeCompilation
17 $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
18 endif
19
20- $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)
21-
22 $1 := $$($1_TARGET)
23 ifneq (,$$($1_LIBRARY))
24 # Generating a dynamic library.
diff --git a/recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch b/recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch
deleted file mode 100644
index e11c19c..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 1fa1097d45afa2fe2bfd989fbd90578f5c5fc540 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 12:14:21 +0100
4Subject: [PATCH] hotspot/aarch64: fix undefined behaviour (gcc v8 fix)
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Backport patch from
10 http://hg.openjdk.java.net/aarch64-port/jdk8u/hotspot/rev/253b0c304db6
11to address segfaults due to undefined behaviour.
12
13|# HG changeset patch
14|# User shade
15|# Date 1526068247 -7200
16|# Node ID 253b0c304db6d31be3d3d7cf7cf1b3561a16dc3a
17|# Parent 1ced2ae00e35e6f855175fc44500b37fbac9e314
18UB in os_linux_aarch64.cpp SpinPause
19Reviewed-by: aph, shade, adinn
20
21Signed-off-by: André Draszik <andre.draszik@jci.com>
22Upstream-Status: Backport [http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916]
23---
24 hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 1 +
25 1 file changed, 1 insertion(+)
26
27diff --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
28index 8b985693..f536817e 100644
29--- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
30+++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
31@@ -699,6 +699,7 @@ void os::verify_stack_alignment() {
32
33 extern "C" {
34 int SpinPause() {
35+ return 0;
36 }
37
38 void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
39--
402.18.0
41
diff --git a/recipes-core/openjdk/patches-openjdk-8/0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch b/recipes-core/openjdk/patches-openjdk-8/0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch
deleted file mode 100644
index 467a1cd..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 3bd88f93a90876f8ead05de40816da0bd1e39aac Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 11:49:26 +0100
4Subject: [PATCH] hotspot/zero: fix undefined behaviour (gcc v8 fix)
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Backport patch from
10 https://bugs.openjdk.java.net/browse/JDK-8202600
11 http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916
12to address segfaults due to undefined behaviour.
13
14|# HG changeset patch
15|# User sgehwolf
16|# Date 1525366788 -7200
17|# Node ID ca4663e589160509d6aef8ec890815e1330b97bc
18|# Parent a27880c1288ba776f65748b68c198df97427f950
198202600: [Zero] Undefined behaviour in src/os_cpu/linux_zero/vm/os_linux_zero.cpp
20Reviewed-by: stuefe, shade, dholmes
21
22Signed-off-by: André Draszik <andre.draszik@jci.com>
23Upstream-Status: Backport [http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916]
24---
25 hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 +
26 1 file changed, 1 insertion(+)
27
28diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
29index 1d069c6d..8dcf9d44 100644
30--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
31+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
32@@ -408,6 +408,7 @@ void os::print_register_info(outputStream *st, void *context) {
33
34 extern "C" {
35 int SpinPause() {
36+ return 0; // Shouldn't matter.
37 }
38
39
40--
412.18.0
42
diff --git a/recipes-core/openjdk/patches-openjdk-8/0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch b/recipes-core/openjdk/patches-openjdk-8/0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch
deleted file mode 100644
index 1421963..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From dbf31e2dfd00e20ab49af70f3533a348e8a6515e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:47:25 +0100
4Subject: [PATCH 4/5] hotspot: Fix debug build after 8062808: Turn on the
5 -Wreturn-type warning
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10|# HG changeset patch
11|# User goetz
12|# Date 1415873641 -3600
13|# Thu Nov 13 11:14:01 2014 +0100
14|# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
15|# Parent 533473c67de6ff767710594639033c8e83523fe5
168064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
17Reviewed-by: stefank, tschatzl
18
19Signed-off-by: André Draszik <andre.draszik@jci.com>
20Upstream-Status: Backport
21---
22 hotspot/src/share/vm/prims/jni.cpp | 2 ++
23 1 file changed, 2 insertions(+)
24
25diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
26index 6a6ab936..e2f2ad3b 100644
27--- a/hotspot/src/share/vm/prims/jni.cpp
28+++ b/hotspot/src/share/vm/prims/jni.cpp
29@@ -708,6 +708,7 @@ JNI_ENTRY(jint, jni_Throw(JNIEnv *env, jthrowable obj))
30
31 THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
32 ShouldNotReachHere();
33+ return 0; // Mute compiler.
34 JNI_END
35
36 #ifndef USDT2
37@@ -734,6 +735,7 @@ JNI_ENTRY(jint, jni_ThrowNew(JNIEnv *env, jclass clazz, const char *message))
38 Handle protection_domain (THREAD, k->protection_domain());
39 THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
40 ShouldNotReachHere();
41+ return 0; // Mute compiler.
42 JNI_END
43
44
45--
462.18.0
47
diff --git a/recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch b/recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch
deleted file mode 100644
index f9feca0..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 90220d41f65910b108c901977eefe78fc1edecc5 Mon Sep 17 00:00:00 2001
2From: Nicola Lunghi <nicola.lunghi@jci.com>
3Date: Mon, 17 Jun 2019 13:59:26 +0100
4Subject: [PATCH] Enable HotSpot builds on 5.x Linux kernels
5
68217753: Enable HotSpot builds on 5.x Linux kernels
7Summary: Remove Linux kernel version check as very unlikely a kernel older than 2.4 will be used.
8Reviewed-by: erikj
9
10Upstream-Status: Backport (http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c)
11---
12 hotspot/make/linux/Makefile | 15 +--------------
13 1 file changed, 1 insertion(+), 14 deletions(-)
14
15diff --git a/hotspot/make/linux/Makefile b/hotspot/make/linux/Makefile
16index 17c14097..e8f20104 100644
17--- a/hotspot/make/linux/Makefile
18+++ b/hotspot/make/linux/Makefile
19@@ -227,20 +227,7 @@ all:
20 @echo " $(TARGETS_SHARK)"
21 @echo " $(TARGETS_MINIMAL1)"
22
23-checks: check_os_version check_j2se_version
24-
25-# We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
26-# Solaris 2.5.1, 2.6).
27-# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
28-
29-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
30-OS_VERSION := $(shell uname -r)
31-EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
32-
33-check_os_version:
34-ifeq ($(DISABLE_HOTSPOT_OS_VERSION_CHECK)$(EMPTY_IF_NOT_SUPPORTED),)
35- $(QUIETLY) >&2 echo "*** This OS is not supported:" `uname -a`; exit 1;
36-endif
37+checks: check_j2se_version
38
39 # jvmti.make requires XSLT (J2SE 1.4.x or newer):
40 XSLT_CHECK = $(REMOTE) $(RUN.JAVAP) javax.xml.transform.TransformerFactory
41--
422.20.1
43
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
index 4618b6b..280ee60 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
@@ -1,7 +1,7 @@
1From d0ebd6f108df9b0f9533de6f16280ceec136d8e6 Mon Sep 17 00:00:00 2001 1From 5e8080a8dd56205f550f7c490f864c95dc8e509b Mon Sep 17 00:00:00 2001
2From: Wenlin Kang <wenlin.kang@windriver.com> 2From: Wenlin Kang <wenlin.kang@windriver.com>
3Date: Sun, 17 Feb 2019 22:38:33 -0800 3Date: Sun, 17 Feb 2019 22:38:33 -0800
4Subject: [PATCH] hotspot: fix crash on JNI_CreateJavaVM 4Subject: [PATCH 1001/1012] hotspot: fix crash on JNI_CreateJavaVM
5 5
6In function os::pd_create_stack_guard_pages(char* addr, size_t size), 6In function os::pd_create_stack_guard_pages(char* addr, size_t size),
7when addr < os::Linux::initial_thread_stack_bottom(), usually munmap() 7when addr < os::Linux::initial_thread_stack_bottom(), usually munmap()
@@ -13,15 +13,16 @@ cause segment(we have reproduced it on linux_PPC).
13Upstream-Status: Pending 13Upstream-Status: Pending
14 14
15Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> 15Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
16Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
16--- 17---
17 hotspot/src/os/linux/vm/os_linux.cpp | 3 ++- 18 src/os/linux/vm/os_linux.cpp | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-) 19 1 file changed, 2 insertions(+), 1 deletion(-)
19 20
20diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp 21diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
21index 044a70a6..b8246ce4 100644 22index 03cabfefb..4f28cc1fb 100644
22--- a/hotspot/src/os/linux/vm/os_linux.cpp 23--- a/hotspot/src/os/linux/vm/os_linux.cpp
23+++ b/hotspot/src/os/linux/vm/os_linux.cpp 24+++ b/hotspot/src/os/linux/vm/os_linux.cpp
24@@ -3078,7 +3078,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) { 25@@ -3192,7 +3192,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
25 uintptr_t stack_extent = (uintptr_t) os::Linux::initial_thread_stack_bottom(); 26 uintptr_t stack_extent = (uintptr_t) os::Linux::initial_thread_stack_bottom();
26 unsigned char vec[1]; 27 unsigned char vec[1];
27 28
@@ -32,5 +33,5 @@ index 044a70a6..b8246ce4 100644
32 stack_extent = (uintptr_t) get_stack_commited_bottom( 33 stack_extent = (uintptr_t) get_stack_commited_bottom(
33 os::Linux::initial_thread_stack_bottom(), 34 os::Linux::initial_thread_stack_bottom(),
34-- 35--
352.17.1 362.24.1
36 37
diff --git a/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch
index 45573e4..3f678dd 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch
@@ -1,7 +1,7 @@
1From 79e35bd203b40979e1d241a04d6d9df373327bef Mon Sep 17 00:00:00 2001 1From df566df123c8af8252c0e113c41c32482834923e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 09:28:06 +0000 3Date: Tue, 27 Feb 2018 09:28:06 +0000
4Subject: [PATCH 5/9] hotspot: use correct include for poll 4Subject: [PATCH 1002/1012] hotspot: use correct include for poll
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -20,16 +20,18 @@ the following command:
20 done 20 done
21 21
22Upstream-Status: Pending 22Upstream-Status: Pending
23
23Signed-off-by: André Draszik <andre.draszik@jci.com> 24Signed-off-by: André Draszik <andre.draszik@jci.com>
25Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
24--- 26---
25 hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +- 27 src/os/aix/vm/os_aix.inline.hpp | 2 +-
26 hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +- 28 src/os/bsd/vm/os_bsd.inline.hpp | 2 +-
27 hotspot/src/os/linux/vm/os_linux.inline.hpp | 2 +- 29 src/os/linux/vm/os_linux.inline.hpp | 2 +-
28 hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 2 +- 30 src/os/solaris/vm/os_solaris.inline.hpp | 2 +-
29 4 files changed, 4 insertions(+), 4 deletions(-) 31 4 files changed, 4 insertions(+), 4 deletions(-)
30 32
31diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp 33diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp
32index a97c94c0..e2974ee1 100644 34index 421ea342e..9a1e1e096 100644
33--- a/hotspot/src/os/aix/vm/os_aix.inline.hpp 35--- a/hotspot/src/os/aix/vm/os_aix.inline.hpp
34+++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp 36+++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp
35@@ -34,7 +34,7 @@ 37@@ -34,7 +34,7 @@
@@ -42,7 +44,7 @@ index a97c94c0..e2974ee1 100644
42 #include <netdb.h> 44 #include <netdb.h>
43 45
44diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp 46diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
45index 10b39941..3144a29c 100644 47index c35abf486..8ff584aee 100644
46--- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp 48--- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
47+++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp 49+++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
48@@ -33,7 +33,7 @@ 50@@ -33,7 +33,7 @@
@@ -55,7 +57,7 @@ index 10b39941..3144a29c 100644
55 57
56 inline void* os::thread_local_storage_at(int index) { 58 inline void* os::thread_local_storage_at(int index) {
57diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp 59diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp
58index 10d56d89..b9b2b775 100644 60index a23bd5631..9d56de0ef 100644
59--- a/hotspot/src/os/linux/vm/os_linux.inline.hpp 61--- a/hotspot/src/os/linux/vm/os_linux.inline.hpp
60+++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp 62+++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp
61@@ -33,7 +33,7 @@ 63@@ -33,7 +33,7 @@
@@ -68,7 +70,7 @@ index 10d56d89..b9b2b775 100644
68 70
69 inline void* os::thread_local_storage_at(int index) { 71 inline void* os::thread_local_storage_at(int index) {
70diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp 72diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp
71index 921fcf7c..5d80a7d0 100644 73index 8e095ab69..ce37e9a12 100644
72--- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp 74--- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp
73+++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp 75+++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp
74@@ -33,7 +33,7 @@ 76@@ -33,7 +33,7 @@
@@ -81,5 +83,5 @@ index 921fcf7c..5d80a7d0 100644
81 #include <unistd.h> 83 #include <unistd.h>
82 #include <netdb.h> 84 #include <netdb.h>
83-- 85--
842.16.2 862.24.1
85 87
diff --git a/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch
index f6af83e..8e31461 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch
@@ -1,7 +1,7 @@
1From 4ed4b58270dcd3d897adef605893c104944c4f3a Mon Sep 17 00:00:00 2001 1From e5bf672f4e10997789f2a447fd95a88703dbd332 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 15:00:55 +0000 3Date: Tue, 27 Feb 2018 15:00:55 +0000
4Subject: [PATCH 6/9] hotspot: don't rely on old SysV SIGCLD 4Subject: [PATCH 1003/1012] hotspot: don't rely on old SysV SIGCLD
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -17,13 +17,15 @@ leads to the following compilation error:
17Just make it conditional, so the code compiles everywhere. 17Just make it conditional, so the code compiles everywhere.
18 18
19Upstream-Status: Pending 19Upstream-Status: Pending
20
20Signed-off-by: André Draszik <andre.draszik@jci.com> 21Signed-off-by: André Draszik <andre.draszik@jci.com>
22Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
21--- 23---
22 hotspot/src/os/linux/vm/jvm_linux.cpp | 2 ++ 24 src/os/linux/vm/jvm_linux.cpp | 2 ++
23 1 file changed, 2 insertions(+) 25 1 file changed, 2 insertions(+)
24 26
25diff --git a/hotspot/src/os/linux/vm/jvm_linux.cpp b/hotspot/src/os/linux/vm/jvm_linux.cpp 27diff --git a/hotspot/src/os/linux/vm/jvm_linux.cpp b/hotspot/src/os/linux/vm/jvm_linux.cpp
26index ba84788a..c22281f7 100644 28index ba84788a1..c22281f7c 100644
27--- a/hotspot/src/os/linux/vm/jvm_linux.cpp 29--- a/hotspot/src/os/linux/vm/jvm_linux.cpp
28+++ b/hotspot/src/os/linux/vm/jvm_linux.cpp 30+++ b/hotspot/src/os/linux/vm/jvm_linux.cpp
29@@ -154,7 +154,9 @@ struct siglabel siglabels[] = { 31@@ -154,7 +154,9 @@ struct siglabel siglabels[] = {
@@ -37,5 +39,5 @@ index ba84788a..c22281f7 100644
37 "CONT", SIGCONT, /* Continue (POSIX). */ 39 "CONT", SIGCONT, /* Continue (POSIX). */
38 "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ 40 "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */
39-- 41--
402.16.2 422.24.1
41 43
diff --git a/recipes-core/openjdk/patches-openjdk-8/0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
index 4ab0d7a..ad480e3 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
@@ -1,7 +1,8 @@
1From cc8fb308b36d323ee8a1e3a60e4c2ac006f710ab Mon Sep 17 00:00:00 2001 1From 3a6eef99b27b7dd750e7a02eb3ada71db99d9345 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Fri, 10 Aug 2018 14:54:45 +0100 3Date: Fri, 10 Aug 2018 14:54:45 +0100
4Subject: [PATCH] hotspot: backport patch to fix misuses of strncpy/strncat 4Subject: [PATCH 1004/1012] hotspot: backport patch to fix misuses of
5 strncpy/strncat
5MIME-Version: 1.0 6MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 8Content-Transfer-Encoding: 8bit
@@ -15,23 +16,22 @@ Fix them using a backport from openjdk-10
15Modelled after http://hg.openjdk.java.net/jdk-updates/jdk10u/rev/b1608535e50f 16Modelled after http://hg.openjdk.java.net/jdk-updates/jdk10u/rev/b1608535e50f
16 17
17Signed-off-by: André Draszik <andre.draszik@jci.com> 18Signed-off-by: André Draszik <andre.draszik@jci.com>
18 19Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
19--- 20---
20Upstream-Status: Backport [http://hg.openjdk.java.net/jdk-updates/jdk10u/rev/b1608535e50f] 21 agent/src/os/linux/libproc_impl.c | 7 ++++++-
21 hotspot/agent/src/os/linux/libproc_impl.c | 7 ++++++- 22 src/share/tools/hsdis/hsdis.c | 1 +
22 hotspot/src/share/tools/hsdis/hsdis.c | 1 + 23 src/share/vm/compiler/compileBroker.hpp | 3 ++-
23 hotspot/src/share/vm/compiler/compileBroker.hpp | 3 ++- 24 src/share/vm/compiler/disassembler.cpp | 1 +
24 hotspot/src/share/vm/compiler/disassembler.cpp | 1 + 25 src/share/vm/runtime/arguments.cpp | 13 ++++++-------
25 hotspot/src/share/vm/runtime/arguments.cpp | 13 ++++++------- 26 src/share/vm/utilities/ostream.cpp | 12 ++++++++----
26 hotspot/src/share/vm/utilities/ostream.cpp | 14 +++++++++----- 27 src/share/vm/utilities/vmError.cpp | 9 +--------
27 hotspot/src/share/vm/utilities/vmError.cpp | 9 +-------- 28 7 files changed, 25 insertions(+), 21 deletions(-)
28 7 files changed, 26 insertions(+), 22 deletions(-)
29 29
30diff --git a/hotspot/agent/src/os/linux/libproc_impl.c b/hotspot/agent/src/os/linux/libproc_impl.c 30diff --git a/hotspot/agent/src/os/linux/libproc_impl.c b/hotspot/agent/src/os/linux/libproc_impl.c
31index 2ea0d0f8..ab23fb16 100644 31index ca791c95d..73a15ce35 100644
32--- a/hotspot/agent/src/os/linux/libproc_impl.c 32--- a/hotspot/agent/src/os/linux/libproc_impl.c
33+++ b/hotspot/agent/src/os/linux/libproc_impl.c 33+++ b/hotspot/agent/src/os/linux/libproc_impl.c
34@@ -162,7 +162,12 @@ lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, 34@@ -159,7 +159,12 @@ lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd,
35 return NULL; 35 return NULL;
36 } 36 }
37 37
@@ -46,10 +46,10 @@ index 2ea0d0f8..ab23fb16 100644
46 46
47 if (fd == -1) { 47 if (fd == -1) {
48diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/hotspot/src/share/tools/hsdis/hsdis.c 48diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/hotspot/src/share/tools/hsdis/hsdis.c
49index b56330e4..4e6fd9af 100644 49index 7bef1040f..1907d479e 100644
50--- a/hotspot/src/share/tools/hsdis/hsdis.c 50--- a/hotspot/src/share/tools/hsdis/hsdis.c
51+++ b/hotspot/src/share/tools/hsdis/hsdis.c 51+++ b/hotspot/src/share/tools/hsdis/hsdis.c
52@@ -410,6 +410,7 @@ static void parse_caller_options(struct hsdis_app_data* app_data, const char* ca 52@@ -438,6 +438,7 @@ static void parse_caller_options(struct hsdis_app_data* app_data, const char* ca
53 } 53 }
54 p = q; 54 p = q;
55 } 55 }
@@ -58,7 +58,7 @@ index b56330e4..4e6fd9af 100644
58 58
59 static void print_help(struct hsdis_app_data* app_data, 59 static void print_help(struct hsdis_app_data* app_data,
60diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/hotspot/src/share/vm/compiler/compileBroker.hpp 60diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/hotspot/src/share/vm/compiler/compileBroker.hpp
61index 7a381cd3..2aea6dd1 100644 61index ad37ff173..16e0ba3aa 100644
62--- a/hotspot/src/share/vm/compiler/compileBroker.hpp 62--- a/hotspot/src/share/vm/compiler/compileBroker.hpp
63+++ b/hotspot/src/share/vm/compiler/compileBroker.hpp 63+++ b/hotspot/src/share/vm/compiler/compileBroker.hpp
64@@ -173,7 +173,8 @@ class CompilerCounters : public CHeapObj<mtCompiler> { 64@@ -173,7 +173,8 @@ class CompilerCounters : public CHeapObj<mtCompiler> {
@@ -72,10 +72,10 @@ index 7a381cd3..2aea6dd1 100644
72 } 72 }
73 73
74diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp 74diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp
75index 69974763..111214a9 100644 75index 93cd9e854..e7b32cd6b 100644
76--- a/hotspot/src/share/vm/compiler/disassembler.cpp 76--- a/hotspot/src/share/vm/compiler/disassembler.cpp
77+++ b/hotspot/src/share/vm/compiler/disassembler.cpp 77+++ b/hotspot/src/share/vm/compiler/disassembler.cpp
78@@ -298,6 +298,7 @@ address decode_env::handle_event(const char* event, address arg) { 78@@ -295,6 +295,7 @@ address decode_env::handle_event(const char* event, address arg) {
79 strlen((const char*)arg) > sizeof(buffer) - 1) { 79 strlen((const char*)arg) > sizeof(buffer) - 1) {
80 // Only print this when the mach changes 80 // Only print this when the mach changes
81 strncpy(buffer, (const char*)arg, sizeof(buffer) - 1); 81 strncpy(buffer, (const char*)arg, sizeof(buffer) - 1);
@@ -84,10 +84,10 @@ index 69974763..111214a9 100644
84 } 84 }
85 } else if (match(event, "format bytes-per-line")) { 85 } else if (match(event, "format bytes-per-line")) {
86diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp 86diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
87index cccff7a8..7589b443 100644 87index 2665b6b8c..5a9294677 100644
88--- a/hotspot/src/share/vm/runtime/arguments.cpp 88--- a/hotspot/src/share/vm/runtime/arguments.cpp
89+++ b/hotspot/src/share/vm/runtime/arguments.cpp 89+++ b/hotspot/src/share/vm/runtime/arguments.cpp
90@@ -3430,7 +3430,7 @@ void Arguments::fix_appclasspath() { 90@@ -3455,7 +3455,7 @@ void Arguments::fix_appclasspath() {
91 } 91 }
92 92
93 char* copy = AllocateHeap(strlen(src) + 1, mtInternal); 93 char* copy = AllocateHeap(strlen(src) + 1, mtInternal);
@@ -96,7 +96,7 @@ index cccff7a8..7589b443 100644
96 96
97 // trim all trailing empty paths 97 // trim all trailing empty paths
98 for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) { 98 for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) {
99@@ -3804,17 +3804,16 @@ static char* get_shared_archive_path() { 99@@ -3834,17 +3834,16 @@ static char* get_shared_archive_path() {
100 if (end != NULL) *end = '\0'; 100 if (end != NULL) *end = '\0';
101 size_t jvm_path_len = strlen(jvm_path); 101 size_t jvm_path_len = strlen(jvm_path);
102 size_t file_sep_len = strlen(os::file_separator()); 102 size_t file_sep_len = strlen(os::file_separator());
@@ -120,19 +120,10 @@ index cccff7a8..7589b443 100644
120 } 120 }
121 return shared_archive_path; 121 return shared_archive_path;
122diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/hotspot/src/share/vm/utilities/ostream.cpp 122diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/hotspot/src/share/vm/utilities/ostream.cpp
123index 44ce683d..bc3773fe 100644 123index 1b00f829a..4daea2b7e 100644
124--- a/hotspot/src/share/vm/utilities/ostream.cpp 124--- a/hotspot/src/share/vm/utilities/ostream.cpp
125+++ b/hotspot/src/share/vm/utilities/ostream.cpp 125+++ b/hotspot/src/share/vm/utilities/ostream.cpp
126@@ -112,7 +112,7 @@ const char* outputStream::do_vsnprintf(char* buffer, size_t buflen, 126@@ -342,15 +342,19 @@ void stringStream::write(const char* s, size_t len) {
127 }
128 if (add_cr) {
129 if (result != buffer) {
130- strncpy(buffer, result, buflen);
131+ memcpy(buffer, result, result_len);
132 result = buffer;
133 }
134 buffer[result_len++] = '\n';
135@@ -337,15 +337,19 @@ void stringStream::write(const char* s, size_t len) {
136 assert(rm == NULL || Thread::current()->current_resource_mark() == rm, 127 assert(rm == NULL || Thread::current()->current_resource_mark() == rm,
137 "stringStream is re-allocated with a different ResourceMark"); 128 "stringStream is re-allocated with a different ResourceMark");
138 buffer = NEW_RESOURCE_ARRAY(char, end); 129 buffer = NEW_RESOURCE_ARRAY(char, end);
@@ -157,10 +148,10 @@ index 44ce683d..bc3773fe 100644
157 // Note that the following does not depend on write_len. 148 // Note that the following does not depend on write_len.
158 // This means that position and count get updated 149 // This means that position and count get updated
159diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp 150diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
160index 15f6bf48..4ab85f5d 100644 151index ef3bb5cee..c11fef472 100644
161--- a/hotspot/src/share/vm/utilities/vmError.cpp 152--- a/hotspot/src/share/vm/utilities/vmError.cpp
162+++ b/hotspot/src/share/vm/utilities/vmError.cpp 153+++ b/hotspot/src/share/vm/utilities/vmError.cpp
163@@ -421,14 +421,7 @@ void VMError::report(outputStream* st) { 154@@ -450,14 +450,7 @@ void VMError::report(outputStream* st) {
164 #else 155 #else
165 const char *file = _filename; 156 const char *file = _filename;
166 #endif 157 #endif
@@ -177,5 +168,5 @@ index 15f6bf48..4ab85f5d 100644
177 st->print(" (0x%x)", _id); 168 st->print(" (0x%x)", _id);
178 } 169 }
179-- 170--
1802.18.0 1712.24.1
181 172
diff --git a/recipes-core/openjdk/patches-openjdk-8/0015-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch
index fb7bb59..81177d0 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0015-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch
@@ -1,7 +1,8 @@
1From f6424c46b4af08d0662eec1a5897d5502270a3b1 Mon Sep 17 00:00:00 2001 1From bce7b39095a839b8e77fe068e87150e855224705 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:40:34 +0100 3Date: Mon, 13 Aug 2018 16:40:34 +0100
4Subject: [PATCH 1/5] hotspot: fix -Wreturn-type issues introduced by 8061651 4Subject: [PATCH 1005/1012] hotspot: fix -Wreturn-type issues introduced by
5 8061651
5MIME-Version: 1.0 6MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 8Content-Transfer-Encoding: 8bit
@@ -14,17 +15,19 @@ Content-Transfer-Encoding: 8bit
14|# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de 15|# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
15PR3601: Fix additional -Wreturn-type issues introduced by 8061651 16PR3601: Fix additional -Wreturn-type issues introduced by 8061651
16 17
17Signed-off-by: André Draszik <andre.draszik@jci.com>
18Upstream-Status: Backport 18Upstream-Status: Backport
19
20Signed-off-by: André Draszik <andre.draszik@jci.com>
21Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
19--- 22---
20 hotspot/src/share/vm/prims/jvm.cpp | 6 +++--- 23 src/share/vm/prims/jvm.cpp | 6 +++---
21 1 file changed, 3 insertions(+), 3 deletions(-) 24 1 file changed, 3 insertions(+), 3 deletions(-)
22 25
23diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp 26diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp
24index 07c36de8..067fd3ac 100644 27index f43dc5ed7..8d7523c55 100644
25--- a/hotspot/src/share/vm/prims/jvm.cpp 28--- a/hotspot/src/share/vm/prims/jvm.cpp
26+++ b/hotspot/src/share/vm/prims/jvm.cpp 29+++ b/hotspot/src/share/vm/prims/jvm.cpp
27@@ -835,7 +835,7 @@ JVM_END 30@@ -908,7 +908,7 @@ JVM_END
28 JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname)) 31 JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
29 JVMWrapper("JVM_KnownToNotExist"); 32 JVMWrapper("JVM_KnownToNotExist");
30 #if INCLUDE_CDS 33 #if INCLUDE_CDS
@@ -33,7 +36,7 @@ index 07c36de8..067fd3ac 100644
33 #else 36 #else
34 return false; 37 return false;
35 #endif 38 #endif
36@@ -845,7 +845,7 @@ JVM_END 39@@ -918,7 +918,7 @@ JVM_END
37 JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader)) 40 JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
38 JVMWrapper("JVM_GetResourceLookupCacheURLs"); 41 JVMWrapper("JVM_GetResourceLookupCacheURLs");
39 #if INCLUDE_CDS 42 #if INCLUDE_CDS
@@ -42,7 +45,7 @@ index 07c36de8..067fd3ac 100644
42 #else 45 #else
43 return NULL; 46 return NULL;
44 #endif 47 #endif
45@@ -855,7 +855,7 @@ JVM_END 48@@ -928,7 +928,7 @@ JVM_END
46 JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name)) 49 JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
47 JVMWrapper("JVM_GetResourceLookupCache"); 50 JVMWrapper("JVM_GetResourceLookupCache");
48 #if INCLUDE_CDS 51 #if INCLUDE_CDS
@@ -52,5 +55,5 @@ index 07c36de8..067fd3ac 100644
52 return NULL; 55 return NULL;
53 #endif 56 #endif
54-- 57--
552.18.0 582.24.1
56 59
diff --git a/recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch
index d6bedbc..38067cb 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0016-hotspot-Zero-build-requires-disabled-warnings.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Zero-build-requires-disabled-warnings.patch
@@ -1,7 +1,7 @@
1From 43c1f744e5f6171df3158baf88dd0a64c4b5e439 Mon Sep 17 00:00:00 2001 1From 84fc6448f44cd45a5448d0e88df8ccabfa10dcc5 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:45:24 +0100 3Date: Mon, 13 Aug 2018 16:45:24 +0100
4Subject: [PATCH 2/5] hotspot: Zero build requires disabled warnings 4Subject: [PATCH 1006/1012] hotspot: Zero build requires disabled warnings
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -15,17 +15,19 @@ Content-Transfer-Encoding: 8bit
158143245, PR3548: Zero build requires disabled warnings 158143245, PR3548: Zero build requires disabled warnings
16Reviewed-by: dholmes, coleenp 16Reviewed-by: dholmes, coleenp
17 17
18Signed-off-by: André Draszik <andre.draszik@jci.com>
19Upstream-Status: Backport 18Upstream-Status: Backport
19
20Signed-off-by: André Draszik <andre.draszik@jci.com>
21Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
20--- 22---
21 hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- 23 src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +-
22 hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- 24 src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++--
23 .../src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 16 +++++++++++++--- 25 src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14 ++++++++++++--
24 .../os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- 26 src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++-
25 4 files changed, 18 insertions(+), 7 deletions(-) 27 4 files changed, 17 insertions(+), 6 deletions(-)
26 28
27diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 29diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
28index 242ce1cf..065471af 100644 30index 525031eb9..d47422b8c 100644
29--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 31--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
30+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 32+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
31@@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) { 33@@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) {
@@ -38,7 +40,7 @@ index 242ce1cf..065471af 100644
38 } 40 }
39 41
40diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp 42diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
41index e23e3eaa..061ed8ce 100644 43index e23e3eaa9..061ed8ce8 100644
42--- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp 44--- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
43+++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp 45+++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
44@@ -1,5 +1,5 @@ 46@@ -1,5 +1,5 @@
@@ -58,17 +60,9 @@ index e23e3eaa..061ed8ce 100644
58 case T_VOID: 60 case T_VOID:
59 ftype = &ffi_type_void; 61 ftype = &ffi_type_void;
60diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 62diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
61index 8dcf9d44..508eb172 100644 63index d22ea1141..cbee43baa 100644
62--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 64--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
63+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 65+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
64@@ -1,6 +1,6 @@
65 /*
66 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
67- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
68+ * Copyright 2016 Red Hat, Inc.
69 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
70 *
71 * This code is free software; you can redistribute it and/or modify it
72@@ -61,6 +61,7 @@ address os::current_stack_pointer() { 66@@ -61,6 +61,7 @@ address os::current_stack_pointer() {
73 67
74 frame os::get_sender_for_C_frame(frame* fr) { 68 frame os::get_sender_for_C_frame(frame* fr) {
@@ -125,7 +119,7 @@ index 8dcf9d44..508eb172 100644
125 119
126 void os::Linux::set_fpu_control_word(int fpu) { 120 void os::Linux::set_fpu_control_word(int fpu) {
127diff --git a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 121diff --git a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
128index 39f77f85..b9c73dc4 100644 122index 39f77f858..b9c73dc48 100644
129--- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 123--- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
130+++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 124+++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
131@@ -1,5 +1,5 @@ 125@@ -1,5 +1,5 @@
@@ -144,5 +138,5 @@ index 39f77f85..b9c73dc4 100644
144 138
145 // These routines are only used on cpu architectures that 139 // These routines are only used on cpu architectures that
146-- 140--
1472.18.0 1412.24.1
148 142
diff --git a/recipes-core/openjdk/patches-openjdk-8/0017-hotspot-Missing-return-statement-in-__sync_val_compa.patch b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch
index 001e905..6692200 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0017-hotspot-Missing-return-statement-in-__sync_val_compa.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch
@@ -1,7 +1,7 @@
1From 6e1d92639787ac8f506f810776a3f1c35f2cd070 Mon Sep 17 00:00:00 2001 1From 996a1e3d53773f41e9098117a69a060722972269 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:46:33 +0100 3Date: Mon, 13 Aug 2018 16:46:33 +0100
4Subject: [PATCH 3/5] hotspot: Missing return statement in 4Subject: [PATCH 1007/1012] hotspot: Missing return statement in
5 __sync_val_compare_and_swap_8 5 __sync_val_compare_and_swap_8
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
@@ -17,15 +17,17 @@ Content-Transfer-Encoding: 8bit
17Summary: Fix issue discovered by -Wreturn-type on systems without LP64. 17Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
18Reviewed-by: aph 18Reviewed-by: aph
19 19
20Signed-off-by: André Draszik <andre.draszik@jci.com>
21Upstream-Status: Backport 20Upstream-Status: Backport
21
22Signed-off-by: André Draszik <andre.draszik@jci.com>
23Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
22--- 24---
23 hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + 25 src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 +
24 hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + 26 src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 +
25 2 files changed, 2 insertions(+) 27 2 files changed, 2 insertions(+)
26 28
27diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 29diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
28index c857b552..4aaf78b1 100644 30index c857b5526..4aaf78b1d 100644
29--- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 31--- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
30+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 32+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
31@@ -457,6 +457,7 @@ extern "C" { 33@@ -457,6 +457,7 @@ extern "C" {
@@ -37,7 +39,7 @@ index c857b552..4aaf78b1 100644
37 }; 39 };
38 #endif // !_LP64 40 #endif // !_LP64
39diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 41diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
40index 508eb172..bb8fa1f1 100644 42index cbee43baa..136d4d3de 100644
41--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 43--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
42+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 44+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
43@@ -498,6 +498,7 @@ extern "C" { 45@@ -498,6 +498,7 @@ extern "C" {
@@ -49,5 +51,5 @@ index 508eb172..bb8fa1f1 100644
49 }; 51 };
50 #endif // !_LP64 52 #endif // !_LP64
51-- 53--
522.18.0 542.24.1
53 55
diff --git a/recipes-core/openjdk/patches-openjdk-8/0019-hotspot-Turn-on-the-Wreturn-type-warning.patch b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch
index 0156978..10dd0f7 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0019-hotspot-Turn-on-the-Wreturn-type-warning.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-Turn-on-the-Wreturn-type-warning.patch
@@ -1,7 +1,7 @@
1From cc0d371f17c0ab060eb1e6b42d4bf053a2cbc3ba Mon Sep 17 00:00:00 2001 1From 2cce90259f9de7b5fba7f3380cdc90b3a586aa75 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 13 Aug 2018 16:48:32 +0100 3Date: Mon, 13 Aug 2018 16:48:32 +0100
4Subject: [PATCH 5/5] hotspot: Turn on the -Wreturn-type warning 4Subject: [PATCH 1008/1012] hotspot: Turn on the -Wreturn-type warning
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -15,29 +15,31 @@ Content-Transfer-Encoding: 8bit
158062808, PR3548: Turn on the -Wreturn-type warning 158062808, PR3548: Turn on the -Wreturn-type warning
16Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett 16Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
17 17
18Signed-off-by: André Draszik <andre.draszik@jci.com>
19Upstream-Status: Backport 18Upstream-Status: Backport
19
20Signed-off-by: André Draszik <andre.draszik@jci.com>
21Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
20--- 22---
21 hotspot/make/linux/makefiles/gcc.make | 2 +- 23 make/linux/makefiles/gcc.make | 2 +-
22 hotspot/src/cpu/x86/vm/x86_32.ad | 1 + 24 src/cpu/x86/vm/x86_32.ad | 1 +
23 hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 1 + 25 src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 1 +
24 hotspot/src/share/vm/classfile/defaultMethods.cpp | 4 ++-- 26 src/share/vm/classfile/defaultMethods.cpp | 4 ++--
25 hotspot/src/share/vm/classfile/symbolTable.cpp | 4 ++-- 27 src/share/vm/classfile/symbolTable.cpp | 4 ++--
26 hotspot/src/share/vm/classfile/systemDictionary.cpp | 6 +++--- 28 src/share/vm/classfile/systemDictionary.cpp | 6 +++---
27 hotspot/src/share/vm/memory/heapInspection.hpp | 2 +- 29 src/share/vm/memory/heapInspection.hpp | 2 +-
28 hotspot/src/share/vm/memory/metaspaceShared.hpp | 2 +- 30 src/share/vm/memory/metaspaceShared.hpp | 2 +-
29 hotspot/src/share/vm/oops/constantPool.hpp | 2 +- 31 src/share/vm/oops/constantPool.hpp | 2 +-
30 hotspot/src/share/vm/prims/jvm.cpp | 2 +- 32 src/share/vm/prims/jvm.cpp | 2 +-
31 hotspot/src/share/vm/runtime/reflection.cpp | 2 +- 33 src/share/vm/runtime/reflection.cpp | 2 +-
32 hotspot/src/share/vm/runtime/sharedRuntime.cpp | 2 +- 34 src/share/vm/runtime/sharedRuntime.cpp | 2 +-
33 hotspot/src/share/vm/services/memTracker.hpp | 2 +- 35 src/share/vm/services/memTracker.hpp | 2 +-
34 13 files changed, 17 insertions(+), 15 deletions(-) 36 13 files changed, 17 insertions(+), 15 deletions(-)
35 37
36diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make 38diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make
37index 272afcea..157afff2 100644 39index 36b3c8ba9..cd9511e50 100644
38--- a/hotspot/make/linux/makefiles/gcc.make 40--- a/hotspot/make/linux/makefiles/gcc.make
39+++ b/hotspot/make/linux/makefiles/gcc.make 41+++ b/hotspot/make/linux/makefiles/gcc.make
40@@ -207,7 +207,7 @@ ifeq ($(USE_CLANG), true) 42@@ -211,7 +211,7 @@ ifeq ($(USE_CLANG), true)
41 WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body 43 WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
42 endif 44 endif
43 45
@@ -47,7 +49,7 @@ index 272afcea..157afff2 100644
47 ifeq ($(USE_CLANG),) 49 ifeq ($(USE_CLANG),)
48 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit 50 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
49diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad 51diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad
50index f42d1a28..c8f4ee16 100644 52index f42d1a288..c8f4ee161 100644
51--- a/hotspot/src/cpu/x86/vm/x86_32.ad 53--- a/hotspot/src/cpu/x86/vm/x86_32.ad
52+++ b/hotspot/src/cpu/x86/vm/x86_32.ad 54+++ b/hotspot/src/cpu/x86/vm/x86_32.ad
53@@ -1250,6 +1250,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo 55@@ -1250,6 +1250,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
@@ -59,7 +61,7 @@ index f42d1a28..c8f4ee16 100644
59 61
60 #ifndef PRODUCT 62 #ifndef PRODUCT
61diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 63diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
62index fb96738a..4cdeb372 100644 64index 1a7375afc..fbf51b040 100644
63--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 65--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
64+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 66+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
65@@ -541,6 +541,7 @@ JVM_handle_linux_signal(int sig, 67@@ -541,6 +541,7 @@ JVM_handle_linux_signal(int sig,
@@ -71,7 +73,7 @@ index fb96738a..4cdeb372 100644
71 73
72 void os::Linux::init_thread_fpu_state(void) { 74 void os::Linux::init_thread_fpu_state(void) {
73diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/hotspot/src/share/vm/classfile/defaultMethods.cpp 75diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/hotspot/src/share/vm/classfile/defaultMethods.cpp
74index 0e3d5d7b..d3df1d15 100644 76index 4b4b4e250..196622aed 100644
75--- a/hotspot/src/share/vm/classfile/defaultMethods.cpp 77--- a/hotspot/src/share/vm/classfile/defaultMethods.cpp
76+++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp 78+++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp
77@@ -506,7 +506,7 @@ Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method 79@@ -506,7 +506,7 @@ Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method
@@ -93,7 +95,7 @@ index 0e3d5d7b..d3df1d15 100644
93 95
94 96
95diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp 97diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp
96index ec97077b..2621a7d6 100644 98index ec97077b7..2621a7d62 100644
97--- a/hotspot/src/share/vm/classfile/symbolTable.cpp 99--- a/hotspot/src/share/vm/classfile/symbolTable.cpp
98+++ b/hotspot/src/share/vm/classfile/symbolTable.cpp 100+++ b/hotspot/src/share/vm/classfile/symbolTable.cpp
99@@ -249,7 +249,7 @@ Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { 101@@ -249,7 +249,7 @@ Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) {
@@ -115,7 +117,7 @@ index ec97077b..2621a7d6 100644
115 117
116 Symbol* SymbolTable::lookup_only(const char* name, int len, 118 Symbol* SymbolTable::lookup_only(const char* name, int len,
117diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp 119diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp
118index 8d2e7f49..62bdba3e 100644 120index da2717d36..5253afc22 100644
119--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp 121--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp
120+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp 122+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp
121@@ -229,15 +229,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader 123@@ -229,15 +229,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader
@@ -138,7 +140,7 @@ index 8d2e7f49..62bdba3e 100644
138 } 140 }
139 141
140diff --git a/hotspot/src/share/vm/memory/heapInspection.hpp b/hotspot/src/share/vm/memory/heapInspection.hpp 142diff --git a/hotspot/src/share/vm/memory/heapInspection.hpp b/hotspot/src/share/vm/memory/heapInspection.hpp
141index 09ee6602..c5fec15c 100644 143index 09ee6602e..c5fec15c3 100644
142--- a/hotspot/src/share/vm/memory/heapInspection.hpp 144--- a/hotspot/src/share/vm/memory/heapInspection.hpp
143+++ b/hotspot/src/share/vm/memory/heapInspection.hpp 145+++ b/hotspot/src/share/vm/memory/heapInspection.hpp
144@@ -367,7 +367,7 @@ class HeapInspection : public StackObj { 146@@ -367,7 +367,7 @@ class HeapInspection : public StackObj {
@@ -151,7 +153,7 @@ index 09ee6602..c5fec15c 100644
151 private: 153 private:
152 void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL); 154 void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
153diff --git a/hotspot/src/share/vm/memory/metaspaceShared.hpp b/hotspot/src/share/vm/memory/metaspaceShared.hpp 155diff --git a/hotspot/src/share/vm/memory/metaspaceShared.hpp b/hotspot/src/share/vm/memory/metaspaceShared.hpp
154index 2f3abae6..d58ebecb 100644 156index 2f3abae6a..d58ebecb2 100644
155--- a/hotspot/src/share/vm/memory/metaspaceShared.hpp 157--- a/hotspot/src/share/vm/memory/metaspaceShared.hpp
156+++ b/hotspot/src/share/vm/memory/metaspaceShared.hpp 158+++ b/hotspot/src/share/vm/memory/metaspaceShared.hpp
157@@ -93,7 +93,7 @@ class MetaspaceShared : AllStatic { 159@@ -93,7 +93,7 @@ class MetaspaceShared : AllStatic {
@@ -164,10 +166,10 @@ index 2f3abae6..d58ebecb 100644
164 static ReservedSpace* shared_rs() { 166 static ReservedSpace* shared_rs() {
165 CDS_ONLY(return _shared_rs); 167 CDS_ONLY(return _shared_rs);
166diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp 168diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp
167index f170decc..a1e168b2 100644 169index 0698eb40e..354293924 100644
168--- a/hotspot/src/share/vm/oops/constantPool.hpp 170--- a/hotspot/src/share/vm/oops/constantPool.hpp
169+++ b/hotspot/src/share/vm/oops/constantPool.hpp 171+++ b/hotspot/src/share/vm/oops/constantPool.hpp
170@@ -349,7 +349,7 @@ class ConstantPool : public Metadata { 172@@ -350,7 +350,7 @@ class ConstantPool : public Metadata {
171 173
172 Klass* klass_at(int which, TRAPS) { 174 Klass* klass_at(int which, TRAPS) {
173 constantPoolHandle h_this(THREAD, this); 175 constantPoolHandle h_this(THREAD, this);
@@ -177,10 +179,10 @@ index f170decc..a1e168b2 100644
177 179
178 Symbol* klass_name_at(int which); // Returns the name, w/o resolving. 180 Symbol* klass_name_at(int which); // Returns the name, w/o resolving.
179diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp 181diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp
180index 067fd3ac..b9e5b322 100644 182index 8d7523c55..4034a8589 100644
181--- a/hotspot/src/share/vm/prims/jvm.cpp 183--- a/hotspot/src/share/vm/prims/jvm.cpp
182+++ b/hotspot/src/share/vm/prims/jvm.cpp 184+++ b/hotspot/src/share/vm/prims/jvm.cpp
183@@ -4280,7 +4280,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( 185@@ -4343,7 +4343,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate(
184 JVM_DTraceProvider* providers)) 186 JVM_DTraceProvider* providers))
185 JVMWrapper("JVM_DTraceActivate"); 187 JVMWrapper("JVM_DTraceActivate");
186 return DTraceJSDT::activate( 188 return DTraceJSDT::activate(
@@ -190,7 +192,7 @@ index 067fd3ac..b9e5b322 100644
190 192
191 JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method)) 193 JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
192diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp 194diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp
193index e2f282ee..679e1775 100644 195index 4b39d8ccb..9cd7b0dcb 100644
194--- a/hotspot/src/share/vm/runtime/reflection.cpp 196--- a/hotspot/src/share/vm/runtime/reflection.cpp
195+++ b/hotspot/src/share/vm/runtime/reflection.cpp 197+++ b/hotspot/src/share/vm/runtime/reflection.cpp
196@@ -1093,7 +1093,7 @@ oop Reflection::invoke(instanceKlassHandle klass, methodHandle reflected_method, 198@@ -1093,7 +1093,7 @@ oop Reflection::invoke(instanceKlassHandle klass, methodHandle reflected_method,
@@ -203,10 +205,10 @@ index e2f282ee..679e1775 100644
203 } 205 }
204 206
205diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp 207diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
206index 8ffa8ab3..219bcd5c 100644 208index d5bea29c3..50578ad63 100644
207--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp 209--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp
208+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp 210+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
209@@ -1038,7 +1038,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, 211@@ -1041,7 +1041,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc,
210 // last java frame on stack (which includes native call frames) 212 // last java frame on stack (which includes native call frames)
211 vframeStream vfst(thread, true); // Do not skip and javaCalls 213 vframeStream vfst(thread, true); // Do not skip and javaCalls
212 214
@@ -216,7 +218,7 @@ index 8ffa8ab3..219bcd5c 100644
216 218
217 219
218diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp 220diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp
219index 38a027ea..13436a4b 100644 221index 7ad2b71f4..182084373 100644
220--- a/hotspot/src/share/vm/services/memTracker.hpp 222--- a/hotspot/src/share/vm/services/memTracker.hpp
221+++ b/hotspot/src/share/vm/services/memTracker.hpp 223+++ b/hotspot/src/share/vm/services/memTracker.hpp
222@@ -64,7 +64,7 @@ class MemTracker : AllStatic { 224@@ -64,7 +64,7 @@ class MemTracker : AllStatic {
@@ -229,5 +231,5 @@ index 38a027ea..13436a4b 100644
229 static inline void record_thread_stack(void* addr, size_t size) { } 231 static inline void record_thread_stack(void* addr, size_t size) { }
230 static inline void release_thread_stack(void* addr, size_t size) { } 232 static inline void release_thread_stack(void* addr, size_t size) { }
231-- 233--
2322.18.0 2342.24.1
233 235
diff --git a/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch
new file mode 100644
index 0000000..ee950cd
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/1009-hotspot-handle-format-error-for-GCC-7.patch
@@ -0,0 +1,34 @@
1From d085dcce6f8700fd8ddda475357496ea6da323dc Mon Sep 17 00:00:00 2001
2From: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com>
3Date: Fri, 21 Sep 2018 10:44:06 +0200
4Subject: [PATCH 1009/1012] hotspot: handle format error for GCC >= 7
5
6Upstream-Status: Pending
7
8Signed-off-by: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com>
9Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
10---
11 src/share/vm/adlc/output_c.cpp | 6 ++++--
12 1 file changed, 4 insertions(+), 2 deletions(-)
13
14diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp
15index b3766636d..eba08d2f0 100644
16--- a/hotspot/src/share/vm/adlc/output_c.cpp
17+++ b/hotspot/src/share/vm/adlc/output_c.cpp
18@@ -436,9 +436,11 @@ static int pipeline_res_mask_initializer(
19 for (i = maxcycleused; i > 0; i /= 10)
20 cycledigit++;
21
22- int maskdigit = 0;
23- for (i = rescount; i > 0; i /= 10)
24+ int maskdigit = 1;
25+ for (i = rescount / 10; i > 0; i /= 10)
26 maskdigit++;
27+ if (maskdigit > 10)
28+ maskdigit = 10;
29
30 static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask";
31 static const char* pipeline_use_element = "Pipeline_Use_Element";
32--
332.24.1
34
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch
index fa26d04..03f8660 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-adlc-flags.patch
@@ -1,22 +1,30 @@
1From 89408e465d92657de8c54d4622f1810c28c3d700 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com>
3Date: Thu, 2 Jan 2020 10:19:29 +0100
4Subject: [PATCH 1010/1012] hotspot: fix adlc flags
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
1adlc is built using the native toolchain, not the crosscompiler. It however 9adlc is built using the native toolchain, not the crosscompiler. It however
2was incorrectly using flags meant for the crosscompiler. 10was incorrectly using flags meant for the crosscompiler.
3 11
4Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
5
6Upstream-Status: Inappropriate [Yocto-specific fixes] 12Upstream-Status: Inappropriate [Yocto-specific fixes]
7 13
14Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
15Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
8--- 16---
9 hotspot/make/linux/makefiles/adlc.make | 10 ++++++++++ 17 make/linux/makefiles/adlc.make | 10 ++++++++++
10 1 file changed, 10 insertions(+) 18 1 file changed, 10 insertions(+)
11 19
12diff --git hotspot/make/linux/makefiles/adlc.make hotspot/make/linux/makefiles/adlc.make 20diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/linux/makefiles/adlc.make
13index 8a86691..2789c03 100644 21index 92b8b9b39..ae0aa0082 100644
14--- hotspot/make/linux/makefiles/adlc.make 22--- a/hotspot/make/linux/makefiles/adlc.make
15+++ hotspot/make/linux/makefiles/adlc.make 23+++ b/hotspot/make/linux/makefiles/adlc.make
16@@ -28,6 +28,16 @@ 24@@ -28,6 +28,16 @@
17 25
18 include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make 26 include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make
19 27
20+# Yocto specific fix - remove target machine flags and replace them with 28+# Yocto specific fix - remove target machine flags and replace them with
21+# build machine flags, as this part is built using the native toolchain 29+# build machine flags, as this part is built using the native toolchain
22+CXXFLAGS:=$(filter-out $(TARGET_CXXFLAGS),$(CXXFLAGS)) 30+CXXFLAGS:=$(filter-out $(TARGET_CXXFLAGS),$(CXXFLAGS))
@@ -28,7 +36,8 @@ index 8a86691..2789c03 100644
28+ 36+
29+ 37+
30 # ######################################################################### 38 # #########################################################################
31 39
32 # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make: 40 # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make:
33-- 41--
341.9.1 422.24.1
43
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch
index ece7f14..8fe5489 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-common.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1011-hotspot-fix-shark-build-common.patch
@@ -1,6 +1,31 @@
1--- hotspot/make/Makefile.orig 1From 1015cc718ba25cabf613b96fd58baa8dfb8492fe Mon Sep 17 00:00:00 2001
2+++ hotspot/make/Makefile 2From: Jens Rehsack <rehsack@gmail.com>
3@@ -525,7 +525,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD 3Date: Thu, 2 Jan 2020 10:22:19 +0100
4Subject: [PATCH 1011/1012] hotspot: fix shark build (common)
5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7---
8 make/Makefile | 2 +-
9 src/cpu/zero/vm/interpreter_zero.cpp | 2 +-
10 src/share/vm/ci/ciTypeFlow.cpp | 4 ++
11 src/share/vm/classfile/systemDictionary.cpp | 4 ++
12 src/share/vm/runtime/handles.inline.hpp | 8 +++-
13 src/share/vm/shark/llvmHeaders.hpp | 4 ++
14 src/share/vm/shark/sharkCompiler.cpp | 39 ++++++++++++++++---
15 src/share/vm/shark/sharkCompiler.hpp | 2 +
16 src/share/vm/shark/sharkContext.cpp | 9 ++++-
17 src/share/vm/shark/sharkContext.hpp | 43 ++++++++++++++++++++-
18 src/share/vm/shark/sharkEntry.hpp | 1 +
19 src/share/vm/shark/sharkIntrinsics.cpp | 4 ++
20 src/share/vm/shark/sharkRuntime.cpp | 1 +
21 src/share/vm/shark/sharkTopLevelBlock.cpp | 12 ++++++
22 14 files changed, 123 insertions(+), 12 deletions(-)
23
24diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile
25index 5765f1e36..f8ff9ecd9 100644
26--- a/hotspot/make/Makefile
27+++ b/hotspot/make/Makefile
28@@ -525,7 +525,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/%
4 # Unix 29 # Unix
5 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX) 30 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
6 $(install-file) 31 $(install-file)
@@ -9,8 +34,23 @@
9 $(install-file) 34 $(install-file)
10 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz 35 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
11 $(install-file) 36 $(install-file)
12--- hotspot/src/share/vm/ci/ciTypeFlow.cpp.orig 37diff --git a/hotspot/src/cpu/zero/vm/interpreter_zero.cpp b/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
13+++ hotspot/src/share/vm/ci/ciTypeFlow.cpp 38index 7172443db..5a4b4ad56 100644
39--- a/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
40+++ b/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
41@@ -49,7 +49,7 @@
42 #ifdef COMPILER1
43 #include "c1/c1_Runtime1.hpp"
44 #endif
45-#ifdef CC_INTERP
46+#if defined(CC_INTERP) || defined(SHARK)
47 #include "interpreter/cppInterpreter.hpp"
48 #endif
49
50diff --git a/hotspot/src/share/vm/ci/ciTypeFlow.cpp b/hotspot/src/share/vm/ci/ciTypeFlow.cpp
51index 4707cc96e..a2b297ca0 100644
52--- a/hotspot/src/share/vm/ci/ciTypeFlow.cpp
53+++ b/hotspot/src/share/vm/ci/ciTypeFlow.cpp
14@@ -35,8 +35,10 @@ 54@@ -35,8 +35,10 @@
15 #include "interpreter/bytecode.hpp" 55 #include "interpreter/bytecode.hpp"
16 #include "interpreter/bytecodes.hpp" 56 #include "interpreter/bytecodes.hpp"
@@ -22,7 +62,7 @@
22 #include "runtime/deoptimization.hpp" 62 #include "runtime/deoptimization.hpp"
23 #include "utilities/growableArray.hpp" 63 #include "utilities/growableArray.hpp"
24 64
25@@ -2648,6 +2650,7 @@ void ciTypeFlow::df_flow_types(Block* st 65@@ -2648,6 +2650,7 @@ void ciTypeFlow::df_flow_types(Block* start,
26 assert (!blk->has_pre_order(), ""); 66 assert (!blk->has_pre_order(), "");
27 blk->set_next_pre_order(); 67 blk->set_next_pre_order();
28 68
@@ -30,7 +70,7 @@
30 if (_next_pre_order >= (int)Compile::current()->max_node_limit() / 2) { 70 if (_next_pre_order >= (int)Compile::current()->max_node_limit() / 2) {
31 // Too many basic blocks. Bail out. 71 // Too many basic blocks. Bail out.
32 // This can happen when try/finally constructs are nested to depth N, 72 // This can happen when try/finally constructs are nested to depth N,
33@@ -2657,6 +2660,7 @@ void ciTypeFlow::df_flow_types(Block* st 73@@ -2657,6 +2660,7 @@ void ciTypeFlow::df_flow_types(Block* start,
34 record_failure("too many basic blocks"); 74 record_failure("too many basic blocks");
35 return; 75 return;
36 } 76 }
@@ -38,9 +78,11 @@
38 if (do_flow) { 78 if (do_flow) {
39 flow_block(blk, temp_vector, temp_set); 79 flow_block(blk, temp_vector, temp_set);
40 if (failing()) return; // Watch for bailouts. 80 if (failing()) return; // Watch for bailouts.
41--- hotspot/src/share/vm/classfile/systemDictionary.cpp.orig 81diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp
42+++ hotspot/src/share/vm/classfile/systemDictionary.cpp 82index 5253afc22..ecb30cdef 100644
43@@ -2289,6 +2289,7 @@ methodHandle SystemDictionary::find_meth 83--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp
84+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp
85@@ -2300,6 +2300,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid
44 spe = NULL; 86 spe = NULL;
45 // Must create lots of stuff here, but outside of the SystemDictionary lock. 87 // Must create lots of stuff here, but outside of the SystemDictionary lock.
46 m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); 88 m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty));
@@ -48,7 +90,7 @@
48 if (!Arguments::is_interpreter_only()) { 90 if (!Arguments::is_interpreter_only()) {
49 // Generate a compiled form of the MH intrinsic. 91 // Generate a compiled form of the MH intrinsic.
50 AdapterHandlerLibrary::create_native_wrapper(m); 92 AdapterHandlerLibrary::create_native_wrapper(m);
51@@ -2298,6 +2299,7 @@ methodHandle SystemDictionary::find_meth 93@@ -2309,6 +2310,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid
52 "out of space in CodeCache for method handle intrinsic", empty); 94 "out of space in CodeCache for method handle intrinsic", empty);
53 } 95 }
54 } 96 }
@@ -56,7 +98,7 @@
56 // Now grab the lock. We might have to throw away the new method, 98 // Now grab the lock. We might have to throw away the new method,
57 // if a racing thread has managed to install one at the same time. 99 // if a racing thread has managed to install one at the same time.
58 { 100 {
59@@ -2311,9 +2313,11 @@ methodHandle SystemDictionary::find_meth 101@@ -2322,9 +2324,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid
60 } 102 }
61 103
62 assert(spe != NULL && spe->method() != NULL, ""); 104 assert(spe != NULL && spe->method() != NULL, "");
@@ -68,9 +110,11 @@
68 return spe->method(); 110 return spe->method();
69 } 111 }
70 112
71--- hotspot/src/share/vm/runtime/handles.inline.hpp.orig 113diff --git a/hotspot/src/share/vm/runtime/handles.inline.hpp b/hotspot/src/share/vm/runtime/handles.inline.hpp
72+++ hotspot/src/share/vm/runtime/handles.inline.hpp 114index 761596a50..ca950c154 100644
73@@ -51,6 +51,12 @@ inline Handle::Handle(Thread* thread, oo 115--- a/hotspot/src/share/vm/runtime/handles.inline.hpp
116+++ b/hotspot/src/share/vm/runtime/handles.inline.hpp
117@@ -51,6 +51,12 @@ inline Handle::Handle(Thread* thread, oop obj) {
74 } 118 }
75 #endif // ASSERT 119 #endif // ASSERT
76 120
@@ -83,7 +127,7 @@
83 // Constructors for metadata handles 127 // Constructors for metadata handles
84 #define DEF_METADATA_HANDLE_FN(name, type) \ 128 #define DEF_METADATA_HANDLE_FN(name, type) \
85 inline name##Handle::name##Handle(type* obj) : _value(obj), _thread(NULL) { \ 129 inline name##Handle::name##Handle(type* obj) : _value(obj), _thread(NULL) { \
86@@ -79,7 +85,7 @@ inline name##Handle::name##Handle(const 130@@ -79,7 +85,7 @@ inline name##Handle::name##Handle(const name##Handle &h) { \
87 } else { \ 131 } else { \
88 _thread = Thread::current(); \ 132 _thread = Thread::current(); \
89 } \ 133 } \
@@ -92,18 +136,10 @@
92 _thread->metadata_handles()->push((Metadata*)_value); \ 136 _thread->metadata_handles()->push((Metadata*)_value); \
93 } else { \ 137 } else { \
94 _thread = NULL; \ 138