diff options
Diffstat (limited to 'build-support/java10-openjdk')
12 files changed, 683 insertions, 0 deletions
diff --git a/build-support/java10-openjdk/PKGBUILD b/build-support/java10-openjdk/PKGBUILD new file mode 100644 index 00000000..d0f15286 --- /dev/null +++ b/build-support/java10-openjdk/PKGBUILD @@ -0,0 +1,324 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> + +# TODO add test, see about packaging jtreg and using it here +# TODO see about building with OpenJDK10 +# TODO add javazi +# TODO when IcedTea provides it, package icedtea-web and add it as optdepends +# TODO package OpenJFX for OpenJDK10 and add it as optdepends + +## EXPLORATIONS +# TODO extract a jmods package from jdk10-openjdk? +# TODO extract a jdk-headless package? + +pkgbase=java10-openjdk +pkgname=('jre10-openjdk-headless' 'jre10-openjdk' 'jdk10-openjdk' 'openjdk10-src' 'openjdk10-doc') +_majorver=10 +_minorver=0 +_securityver=2 +_updatever=13 +pkgrel=1 +pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} +_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} +arch=('x86_64' 'i486' 'i686' 'pentium4') +url='http://openjdk.java.net/' +license=('custom') +makedepends=('jdk9-openjdk' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11' + 'libxrender' 'libxtst' 'libxt' 'libxext' 'alsa-lib' + 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' + 'libnet' 'bash') +source=(http://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz + freedesktop-java.desktop + freedesktop-jconsole.desktop + freedesktop-jshell.desktop + jdk10u-jdk-10.0.2+13-make43.patch + jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon.patch + jdk10u-jdk-10.0.2+13-bitmap-segv.patch + jdk10u-jdk-10.0.2+13-oscontainer-wrong-compare.patch + jdk10u-jdk-10.0.2+13-c1.patch + ) +sha256sums=('f34a53b049f2e3ee8d954998687c4a48b56f24efbb2738ae7fe81bbbdff7f078' + '819e6ca314641c3115566f9478fbd8671f5d884a3d4e65f05950b4bd2d3b8451' + '5276edf203e5a75607c55b8bd4ae4f76cf61360811190286829c66d0c4b06554' + '0bcdb1eb9640775ca61e87ffeb9b0e0f99386b41f51fec753688bdd5ff9b6010' + 'e35145e071fd173d696afd7ad0a1d7ed4483d53980c3ac54113dc535769ccb37' + 'b266913bf362c46ace53972fabc1014a9e4e455981f2f22a551037f6d300a13b' + 'c7af7c1a22ba0174225cd29733d484b5a4aefe9e0a6b1f505c3fff51e697cd7a' + 'd9f4ec837471ad48dbcac60e99be2617afb970d92eeb1d636eb91abfd7382554' + '1f2c39b9c0c0c4371cf5f098d7ea970970ac6102917d4308ed57c0f5585bdb0b' + ) + +case "${CARCH}" in + x86_64) _JARCH='x86_64';; + i486|i686|pentium4) _JARCH='x86';; +esac + +_jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk +_jdkdir=jdk${_majorver}u-${_hg_tag} +_imgdir=${_jdkdir}/build/linux-${_JARCH}-normal-server-release/images +_imgdir="${_imgdir//--/-${_JARCH}-}" + +_nonheadless=(lib/libawt_xawt.so + lib/libjawt.so + lib/libjsoundalsa.so + lib/libsplashscreen.so) +#_nonheadless=( +# "${_nonheadless[@]/\/\///${_JARCH}/}" +#) + +prepare() { + cd ${_jdkdir} + + # see https://bugs.openjdk.java.net/browse/JDK-8237879 + patch -Np1 < $srcdir/jdk10u-jdk-10.0.2+13-make43.patch + + # some gcc 10 issues and backports of known bugs + patch -Np1 < $srcdir/jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon.patch + patch -Np1 < $srcdir/jdk10u-jdk-10.0.2+13-bitmap-segv.patch + patch -Np1 < $srcdir/jdk10u-jdk-10.0.2+13-oscontainer-wrong-compare.patch + patch -Np1 < $srcdir/jdk10u-jdk-10.0.2+13-c1.patch +} + +build() { + cd ${_jdkdir} + + NUM_PROC_OPT='' + MAKEFLAG_J=$(echo ${MAKEFLAGS} | sed -En 's/.*-j([0-9]+).*/\1/p') + if [ -n "${MAKEFLAG_J}" ]; then + # http://hg.openjdk.java.net/jdk10/jdk10/file/85e6cb013b98/make/InitSupport.gmk#l105 + echo "Removing '-j${MAKEFLAG_J}' from MAKEFLAGS to prevent build fail. Passing it directly to ./configure." + export MAKEFLAGS=${MAKEFLAGS/-j${MAKEFLAG_J}/} +# fails to build with more than one core +# NUM_PROC_OPT="--with-num-cores=${MAKEFLAG_J}" + NUM_PROC_OPT="--with-num-cores=1" + fi + + # Avoid optimization of HotSpot being lowered from O3 to O2 + local _CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS}" + local _CXXFLAGS="${CXXFLAGS//-O2/-O3} ${CPPFLAGS}" + local _LDFLAGS=${LDFLAGS} + if [[ $CARCH = i486 || $CARCH = i686 || $CARCH = pentium4 ]]; then + echo "Removing '-fno-plt' from CFLAGS and CXXFLAGS to prevent build fail with this architecture" + _CFLAGS=${CFLAGS/-fno-plt/} + _CXXFLAGS=${CXXFLAGS/-fno-plt/} + fi + + # i486-specific + if [ "${CARCH}" = "i486" ]; then + _JARCH=i386 + _DOC_ARCH=x86 + fi + + # pentium4-specific + if [ "${CARCH}" = "pentium4" ]; then + _JARCH=i386 + _DOC_ARCH=x86 + # force 4-byte stack alignment on SSE aptimized systems, see FS32#75 + _CFLAGS+=" -mincoming-stack-boundary=2" + _CXXFLAGS+=" -mincoming-stack-boundary=2" + fi + + # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning + # in the output of ./configure unless used like such: + # --with-extra-cflags="${CFLAGS}" + # --with-extra-cxxflags="${CXXFLAGS}" + # --with-extra-ldflags="${LDFLAGS}" + # See also paragraph "Configure Control Variables from "jdk${_majorver}-${_hg_tag}/common/doc/building.md + unset CFLAGS + unset CXXFLAGS + unset LDFLAGS + + bash configure \ + --with-version-build="${_updatever}" \ + --with-version-pre="" \ + --with-version-opt="" \ + --with-stdc++lib=dynamic \ + --with-extra-cflags="${_CFLAGS}" \ + --with-extra-cxxflags="${_CXXFLAGS}" \ + --with-extra-ldflags="${_LDFLAGS}" \ + --with-libjpeg=system \ + --with-giflib=system \ + --with-libpng=system \ + --with-lcms=system \ + --with-zlib=system \ + --enable-unlimited-crypto \ + --disable-warnings-as-errors \ + ${NUM_PROC_OPT} + #--disable-javac-server + + make images docs + + # https://bugs.openjdk.java.net/browse/JDK-8173610 + find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \; +} + +check() { + cd ${_jdkdir} + #make -k check + #make run-test-tier1 +} + +package_jre10-openjdk-headless() { + pkgdesc="OpenJDK Java ${_majorver} headless runtime environment" + depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'lcms2' 'libnet' 'freetype2') + optdepends=('java-rhino: for some JavaScript support') + provides=("java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}") + replaces=('jre9-openjdk-headless') + backup=(etc/${pkgbase}/logging.properties + etc/${pkgbase}/management/jmxremote.access + etc/${pkgbase}/management/jmxremote.password.template + etc/${pkgbase}/management/management.properties + etc/${pkgbase}/net.properties + etc/${pkgbase}/security/java.policy + etc/${pkgbase}/security/java.security + etc/${pkgbase}/security/policy/README.txt + etc/${pkgbase}/security/policy/limited/default_US_export.policy + etc/${pkgbase}/security/policy/limited/default_local.policy + etc/${pkgbase}/security/policy/limited/exempt_local.policy + etc/${pkgbase}/security/policy/unlimited/default_US_export.policy + etc/${pkgbase}/security/policy/unlimited/default_local.policy + etc/${pkgbase}/sound.properties) + install=install_jre10-openjdk-headless.sh + + cd ${_imgdir}/jre + + install -dm 755 "${pkgdir}${_jvmdir}" + + cp -a bin lib \ + "${pkgdir}${_jvmdir}" + + for f in "${_nonheadless[@]}"; do + rm "${pkgdir}${_jvmdir}/${f}" + done + + cp ../jdk/release "${pkgdir}${_jvmdir}" + cp ../jdk/lib/modules "${pkgdir}${_jvmdir}/lib" + + # Conf + install -dm 755 "${pkgdir}/etc" + cp -r conf "${pkgdir}/etc/${pkgbase}" + ln -s /etc/${pkgbase} "${pkgdir}/${_jvmdir}/conf" + + # Legal + install -dm 755 "${pkgdir}/usr/share/licenses" + cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}" + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" + ln -s /usr/share/licenses/${pkgbase} "${pkgdir}/${_jvmdir}/legal" + + # Man pages + for f in man/man1/* man/ja/man1/*; do + install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-openjdk10.1}" + done + ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man" + + # Link JKS keystore from ca-certificates-utils + rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts" + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts" +} + +package_jre10-openjdk() { + pkgdesc="OpenJDK Java ${_majorver} full runtime environment" + depends=("jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}" 'giflib') + optdepends=('alsa-lib: for basic sound support' + 'gtk2: for the Gtk+ 2 look and feel - desktop usage' + 'gtk3: for the Gtk+ 3 look and feel - desktop usage') + provides=("java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}") + replaces=('jre9-openjdk ') + install=install_jre10-openjdk.sh + + cd ${_imgdir}/jre + + install -dm 755 "${pkgdir}${_jvmdir}" + + for f in "${_nonheadless[@]}"; do + install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}" + done + + # Licenses + install -dm 755 "${pkgdir}/usr/share/licenses" + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_jdk10-openjdk() { + pkgdesc="OpenJDK Java ${_majorver} development kit" + depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3' 'hicolor-icon-theme' 'libelf') + provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}") + replaces=('jdk9-openjdk') + install=install_jdk10-openjdk.sh + + cd ${_imgdir}/jdk + + install -dm 755 "${pkgdir}${_jvmdir}" + + cp -a bin demo include jmods lib \ + "${pkgdir}${_jvmdir}" + + rm "${pkgdir}${_jvmdir}/lib/src.zip" + + # Remove files held by JRE + pushd ../jre + for d in bin lib; do + find ${d} ! -type d -exec rm "${pkgdir}${_jvmdir}/{}" \; + done + popd + find "${pkgdir}${_jvmdir}/lib" -type d -empty -delete + + # Conf files all belong to JRE + + # Legal + install -dm 755 "${pkgdir}/usr/share/licenses" + cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}" + pushd ../jre/legal + find . ! -type d -exec rm "${pkgdir}/usr/share/licenses/${pkgbase}/{}" \; + popd + find "${pkgdir}/usr/share/licenses" -type d -empty -delete + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" + + # Man pages + for f in man/man1/* man/ja/man1/*; do + if [ ! -e "../jre/${f}" ]; then + install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-openjdk${_majorver}.1}" + fi + done + + # Icons + for s in 16 24 32 48; do + install -Dm 644 \ + "${srcdir}/jdk${_majorver}u-${_hg_tag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png" \ + "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/${pkgbase}.png" + done + + # Desktop files + for f in jconsole java jshell; do + install -Dm 644 \ + "${srcdir}/freedesktop-${f}.desktop" \ + "${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop" + done +} + +package_openjdk10-src() { + pkgdesc="OpenJDK Java ${_majorver} sources" + # Depends on JDK to get license files + depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}") + replaces=('openjdk9-src') + + install -Dm 644 -t "${pkgdir}${_jvmdir}/lib" ${_imgdir}/jdk/lib/src.zip + + install -dm 755 "${pkgdir}/usr/share/licenses" + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_openjdk10-doc() { + pkgdesc="OpenJDK Java ${_majorver} documentation" + # Depends on JDK to get license files + depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}") + replaces=('openjdk9-doc') + + install -dm 755 "${pkgdir}/usr/share/doc" + cp -r ${_imgdir}/docs "${pkgdir}/usr/share/doc/${pkgbase}" + + install -dm 755 "${pkgdir}/usr/share/licenses" + ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +# vim: ts=2 sw=2 et: diff --git a/build-support/java10-openjdk/freedesktop-java.desktop b/build-support/java10-openjdk/freedesktop-java.desktop new file mode 100644 index 00000000..a84496ec --- /dev/null +++ b/build-support/java10-openjdk/freedesktop-java.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=OpenJDK Java 10 Runtime +Name[fi]=OpenJDK Java 10 - ajonaikainen ympäristö +Comment=OpenJDK Java 10 Runtime +Comment[fi]=OpenJDK Java 10 - ajonaikainen ympäristö +Keywords=java;runtime +Exec=/usr/lib/jvm/java-10-openjdk/bin/java -jar +Terminal=false +Type=Application +Icon=java10-openjdk +MimeType=application/x-java-archive;application/java-archive;application/x-jar; +NoDisplay=true diff --git a/build-support/java10-openjdk/freedesktop-jconsole.desktop b/build-support/java10-openjdk/freedesktop-jconsole.desktop new file mode 100644 index 00000000..50436a54 --- /dev/null +++ b/build-support/java10-openjdk/freedesktop-jconsole.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=OpenJDK Java 10 Console +Name[fi]=OpenJDK Java 10 - konsoli +Comment=OpenJDK Java 10 Monitoring & Management Console +Comment[fi]=OpenJDK Java 10 - valvonta- ja hallintakonsoli +Keywords=java;console;monitoring +Exec=/usr/lib/jvm/java-10-openjdk/bin/jconsole +Terminal=false +Type=Application +Icon=java10-openjdk +Categories=Application;System; diff --git a/build-support/java10-openjdk/freedesktop-jshell.desktop b/build-support/java10-openjdk/freedesktop-jshell.desktop new file mode 100644 index 00000000..a0cdd900 --- /dev/null +++ b/build-support/java10-openjdk/freedesktop-jshell.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=OpenJDK Java 10 Shell +Comment=OpenJDK Java 10 Shell +Keywords=java;shell +Exec=/usr/lib/jvm/java-10-openjdk/bin/jshell +Terminal=true +Type=Application +Icon=java10-openjdk +Categories=Application;System; diff --git a/build-support/java10-openjdk/install_jdk10-openjdk.sh b/build-support/java10-openjdk/install_jdk10-openjdk.sh new file mode 100644 index 00000000..d931854c --- /dev/null +++ b/build-support/java10-openjdk/install_jdk10-openjdk.sh @@ -0,0 +1,50 @@ +THIS_JDK='java-10-openjdk' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/archlinux-java unset + echo "" + else + /usr/bin/archlinux-java get + fi +} + +post_install() { + default=$(fix_default) + case ${default} in + "") + /usr/bin/archlinux-java set ${THIS_JDK} + ;; + ${THIS_JDK}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'archlinux-java help' to change it" + ;; + esac + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +post_upgrade() { + default=$(fix_default) + if [ -z "${default}" ]; then + /usr/bin/archlinux-java set ${THIS_JDK} + fi + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +pre_remove() { + if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then + # Check JRE10 is still available + if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then + /usr/bin/archlinux-java unset + fi + fi +} diff --git a/build-support/java10-openjdk/install_jre10-openjdk-headless.sh b/build-support/java10-openjdk/install_jre10-openjdk-headless.sh new file mode 100644 index 00000000..1b02d707 --- /dev/null +++ b/build-support/java10-openjdk/install_jre10-openjdk-headless.sh @@ -0,0 +1,48 @@ +THIS_JRE='java-10-openjdk' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/archlinux-java unset + echo "" + else + /usr/bin/archlinux-java get + fi +} + +post_install() { + default=$(fix_default) + case ${default} in + "") + /usr/bin/archlinux-java set ${THIS_JRE} + ;; + ${THIS_JRE}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'archlinux-java help' to change it" + ;; + esac + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +post_upgrade() { + if [ -z "$(fix_default)" ]; then + /usr/bin/archlinux-java set ${THIS_JRE} + fi + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +pre_remove() { + default=$(fix_default) + if [ "x${default}" = "x${THIS_JRE}" ]; then + /usr/bin/archlinux-java unset + echo "No Java environment is set as default anymore" + fi +} diff --git a/build-support/java10-openjdk/install_jre10-openjdk.sh b/build-support/java10-openjdk/install_jre10-openjdk.sh new file mode 100644 index 00000000..47003e56 --- /dev/null +++ b/build-support/java10-openjdk/install_jre10-openjdk.sh @@ -0,0 +1,35 @@ +THIS_JRE='java-10-openjdk' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/archlinux-java unset + echo "" + else + /usr/bin/archlinux-java get + fi +} + +post_install() { + default=$(fix_default) + case ${default} in + "") + /usr/bin/archlinux-java set ${THIS_JRE} + ;; + ${THIS_JRE}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'archlinux-java help' to change it" + ;; + esac + + echo "when you use a non-reparenting window manager," + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh" +} + +post_upgrade() { + if [ -z "$(fix_default)" ]; then + /usr/bin/archlinux-java set ${THIS_JRE} + fi +} diff --git a/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-bitmap-segv.patch b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-bitmap-segv.patch new file mode 100644 index 00000000..96cec5ac --- /dev/null +++ b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-bitmap-segv.patch @@ -0,0 +1,14 @@ +diff -rauN jdk10u-jdk-10.0.2+13/src/hotspot/share/utilities/bitMap.cpp jdk10u-jdk-10.0.2+13-bitmap-segv-patch/src/hotspot/share/utilities/bitMap.cpp +--- jdk10u-jdk-10.0.2+13/src/hotspot/share/utilities/bitMap.cpp 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-bitmap-segv-patch/src/hotspot/share/utilities/bitMap.cpp 2021-05-17 17:10:22.467980460 +0200 +@@ -548,7 +548,9 @@ + bm_word_t* dest_map = map(); + const bm_word_t* other_map = other.map(); + idx_t copy_words = word_index(size()); +- Copy::disjoint_words((HeapWord*)other_map, (HeapWord*)dest_map, copy_words); ++ if (other_map != NULL) { ++ Copy::disjoint_words((HeapWord*)other_map, (HeapWord*)dest_map, copy_words); ++ } + idx_t rest = bit_in_word(size()); + if (rest > 0) { + dest_map[copy_words] = merge_tail_of_map(other_map[copy_words], diff --git a/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-c1.patch b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-c1.patch new file mode 100644 index 00000000..2217b37f --- /dev/null +++ b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-c1.patch @@ -0,0 +1,57 @@ +diff -rauN jdk10u-jdk-10.0.2+13/src/hotspot/share/c1/c1_Instruction.hpp jdk10u-jdk-10.0.2+13-c1-patch/src/hotspot/share/c1/c1_Instruction.hpp +--- jdk10u-jdk-10.0.2+13/src/hotspot/share/c1/c1_Instruction.hpp 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-c1-patch/src/hotspot/share/c1/c1_Instruction.hpp 2021-05-17 17:31:40.472148317 +0200 +@@ -303,7 +303,6 @@ + XHandlers* _exception_handlers; // Flat list of exception handlers covering this instruction + + friend class UseCountComputer; +- friend class BlockBegin; + + void update_exception_state(ValueStack* state); + +@@ -349,7 +348,6 @@ + void* operator new(size_t size) throw() { + Compilation* c = Compilation::current(); + void* res = c->arena()->Amalloc(size); +- ((Instruction*)res)->_id = c->get_next_id(); + return res; + } + +@@ -410,7 +408,8 @@ + + // creation + Instruction(ValueType* type, ValueStack* state_before = NULL, bool type_is_constant = false) +- : _use_count(0) ++ : _id(Compilation::current()->get_next_id()) ++ , _use_count(0) + #ifndef PRODUCT + , _printable_bci(-99) + #endif +@@ -1648,8 +1647,6 @@ + void* operator new(size_t size) throw() { + Compilation* c = Compilation::current(); + void* res = c->arena()->Amalloc(size); +- ((BlockBegin*)res)->_id = c->get_next_id(); +- ((BlockBegin*)res)->_block_id = c->get_next_block_id(); + return res; + } + +@@ -1661,6 +1658,7 @@ + // creation + BlockBegin(int bci) + : StateSplit(illegalType) ++ , _block_id(Compilation::current()->get_next_block_id()) + , _bci(bci) + , _depth_first_number(-1) + , _linear_scan_number(-1) +diff -rauN jdk10u-jdk-10.0.2+13/src/hotspot/share/c1/c1_ValueMap.cpp jdk10u-jdk-10.0.2+13-c1-patch/src/hotspot/share/c1/c1_ValueMap.cpp +--- jdk10u-jdk-10.0.2+13/src/hotspot/share/c1/c1_ValueMap.cpp 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-c1-patch/src/hotspot/share/c1/c1_ValueMap.cpp 2021-05-17 17:32:03.702163251 +0200 +@@ -488,6 +488,7 @@ + : _current_map(NULL) + , _value_maps(ir->linear_scan_order()->length(), ir->linear_scan_order()->length(), NULL) + , _compilation(ir->compilation()) ++ , _has_substitutions(false) + { + TRACE_VALUE_NUMBERING(tty->print_cr("****** start of global value numbering")); + diff --git a/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon.patch b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon.patch new file mode 100644 index 00000000..92700957 --- /dev/null +++ b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon.patch @@ -0,0 +1,87 @@ +diff -rauN jdk10u-jdk-10.0.2+13/src/java.base/unix/native/libjava/childproc.c jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.c +--- jdk10u-jdk-10.0.2+13/src/java.base/unix/native/libjava/childproc.c 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.c 2021-05-16 21:08:01.825997035 +0200 +@@ -33,6 +33,7 @@ + + #include "childproc.h" + ++const char * const *parentPathv; + + ssize_t + restartableWrite(int fd, const void *buf, size_t count) +diff -rauN jdk10u-jdk-10.0.2+13/src/java.base/unix/native/libjava/childproc.h jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.h +--- jdk10u-jdk-10.0.2+13/src/java.base/unix/native/libjava/childproc.h 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.h 2021-05-16 21:08:01.905997132 +0200 +@@ -118,7 +118,7 @@ + * The cached and split version of the JDK's effective PATH. + * (We don't support putenv("PATH=...") in native code) + */ +-const char * const *parentPathv; ++extern const char * const *parentPathv; + + ssize_t restartableWrite(int fd, const void *buf, size_t count); + int restartableDup2(int fd_from, int fd_to); +diff -rauN jdk10u-jdk-10.0.2+13/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c +--- jdk10u-jdk-10.0.2+13/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c 2021-05-16 21:08:01.905997132 +0200 +@@ -28,6 +28,9 @@ + #include <dlfcn.h> + #include "NativeFunc.h" + ++/* global GSS function table */ ++GSS_FUNCTION_TABLE_PTR ftab; ++ + /* standard GSS method names (ordering is from mapfile) */ + static const char RELEASE_NAME[] = "gss_release_name"; + static const char IMPORT_NAME[] = "gss_import_name"; +diff -rauN jdk10u-jdk-10.0.2+13/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h +--- jdk10u-jdk-10.0.2+13/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h 2021-05-16 21:08:01.975997215 +0200 +@@ -265,6 +265,6 @@ + typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; + + /* global GSS function table */ +-GSS_FUNCTION_TABLE_PTR ftab; ++extern GSS_FUNCTION_TABLE_PTR ftab; + + #endif +diff -rauN jdk10u-jdk-10.0.2+13/src/jdk.sctp/unix/native/libsctp/Sctp.h jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/Sctp.h +--- jdk10u-jdk-10.0.2+13/src/jdk.sctp/unix/native/libsctp/Sctp.h 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/Sctp.h 2021-05-16 21:08:01.975997215 +0200 +@@ -322,12 +322,12 @@ + + #endif /* __linux__ */ + +-sctp_getladdrs_func* nio_sctp_getladdrs; +-sctp_freeladdrs_func* nio_sctp_freeladdrs; +-sctp_getpaddrs_func* nio_sctp_getpaddrs; +-sctp_freepaddrs_func* nio_sctp_freepaddrs; +-sctp_bindx_func* nio_sctp_bindx; +-sctp_peeloff_func* nio_sctp_peeloff; ++extern sctp_getladdrs_func* nio_sctp_getladdrs; ++extern sctp_freeladdrs_func* nio_sctp_freeladdrs; ++extern sctp_getpaddrs_func* nio_sctp_getpaddrs; ++extern sctp_freepaddrs_func* nio_sctp_freepaddrs; ++extern sctp_bindx_func* nio_sctp_bindx; ++extern sctp_peeloff_func* nio_sctp_peeloff; + + jboolean loadSocketExtensionFuncs(JNIEnv* env); + +diff -rauN jdk10u-jdk-10.0.2+13/src/jdk.sctp/unix/native/libsctp/SctpNet.c jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/SctpNet.c +--- jdk10u-jdk-10.0.2+13/src/jdk.sctp/unix/native/libsctp/SctpNet.c 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/SctpNet.c 2021-05-16 21:08:01.975997215 +0200 +@@ -28,6 +28,14 @@ + #include <dlfcn.h> + + #include "Sctp.h" ++ ++sctp_getladdrs_func* nio_sctp_getladdrs; ++sctp_freeladdrs_func* nio_sctp_freeladdrs; ++sctp_getpaddrs_func* nio_sctp_getpaddrs; ++sctp_freepaddrs_func* nio_sctp_freepaddrs; ++sctp_bindx_func* nio_sctp_bindx; ++sctp_peeloff_func* nio_sctp_peeloff; ++ + #include "jni.h" + #include "jni_util.h" + #include "nio_util.h" diff --git a/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-make43.patch b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-make43.patch new file mode 100644 index 00000000..1827b012 --- /dev/null +++ b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-make43.patch @@ -0,0 +1,24 @@ +diff -rauN jdk10u-jdk-10.0.2+13/make/common/MakeBase.gmk jdk10u-jdk-10.0.2+13-make43-patch/make/common/MakeBase.gmk +--- jdk10u-jdk-10.0.2+13/make/common/MakeBase.gmk 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-make43-patch/make/common/MakeBase.gmk 2021-05-16 20:53:00.001488298 +0200 +@@ -960,15 +960,16 @@ + # Param 2 - (optional) name of file to store value in + DependOnVariableHelper = \ + $(strip \ +- $(eval -include $(call DependOnVariableFileName, $1, $2)) \ ++ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \ ++ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \ + $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ +- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ ++ $(call MakeDir, $(dir $($1_filename))) \ + $(if $(findstring $(LOG_LEVEL), trace), \ + $(info NewVariable $1: >$(strip $($1))<) \ + $(info OldVariable $1: >$(strip $($1_old))<)) \ + $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \ +- $(call DependOnVariableFileName, $1, $2))) \ +- $(call DependOnVariableFileName, $1, $2) \ ++ $($1_filename))) \ ++ $($1_filename) \ + ) + + # Main macro diff --git a/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-oscontainer-wrong-compare.patch b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-oscontainer-wrong-compare.patch new file mode 100644 index 00000000..549115eb --- /dev/null +++ b/build-support/java10-openjdk/jdk10u-jdk-10.0.2+13-oscontainer-wrong-compare.patch @@ -0,0 +1,12 @@ +diff -rauN jdk10u-jdk-10.0.2+13/src/hotspot/os/linux/os_linux.cpp jdk10u-jdk-10.0.2+13-oscontainer-wrong-compare-patch/src/hotspot/os/linux/os_linux.cpp +--- jdk10u-jdk-10.0.2+13/src/hotspot/os/linux/os_linux.cpp 2018-06-24 16:07:06.000000000 +0200 ++++ jdk10u-jdk-10.0.2+13-oscontainer-wrong-compare-patch/src/hotspot/os/linux/os_linux.cpp 2021-05-17 17:26:13.438603378 +0200 +@@ -2155,7 +2155,7 @@ + } + + p = OSContainer::cpu_cpuset_memory_nodes(); +- if (p < 0) ++ if (p == NULL) + st->print("cpu_memory_nodes() failed\n"); + else { + st->print("cpu_memory_nodes: %s\n", p); |