added java9-openjdk to build-support (for bootstrapping java on i486)

8 files changed, 579 insertions, 0 deletions

diff --git a/build-support/java9-openjdk/PKGBUILD b/build-support/java9-openjdk/PKGBUILD
new file mode 100644
index 00000000..6d850a1c
--- /dev/null
+++ b/build-support/java9-openjdk/PKGBUILD
@@ -0,0 +1,348 @@
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
+
+# TODO add test, see about packaging jtreg and using it here
+# TODO see about building with OpenJDK9
+# TODO add javazi
+# TODO when IcedTea provides it, package icedtea-web and add it as optdepends
+# TODO package OpenJFX for OpenJDK9 and add it as optdepends
+
+## EXPLORATIONS
+# TODO extract a jmods package from jdk9-openjdk?
+# TODO extract a jdk-headless package?
+#      Now that `jconsole` and `policytool` belong to JDK, one could extract
+#      these to their own package.
+#      FYI, `jdk8-openjdk` already depends on `jre8-openjdk` and not `jre8-openjdk-headless`
+
+pkgname=('jre9-openjdk-headless' 'jre9-openjdk' 'jdk9-openjdk' 'openjdk9-src' 'openjdk9-doc')
+_majorver=9
+_minorver=0
+_securityver=4
+_updatever=12
+pkgbase=java$_majorver-openjdk
+pkgver=$_majorver.$_minorver.$_securityver.u$_updatever
+_hg_tag="jdk-$_majorver.$_minorver.$_securityver+$_updatever"
+_repo_ver=jdk$_java_ver.$_hg_tag
+pkgrel=1
+_pkg_full_ver=$pkgver-$pkgrel
+arch=('x86_64' i486 i686 pentium4)
+url='http://openjdk.java.net/'
+license=('custom')
+makedepends=('jdk8-openjdk' 'cpio' 'unzip' 'zip'
+             'libelf' # required for AOT
+             'libcups'
+             'libx11' 'libxrender' 'libxtst' 'libxt' # 'libxext' already pulled by libxtst
+             'alsa-lib'
+             'graphviz') # to generate full docs (as said in output of configure)
+             # 'freetype2' already pulled
+             # 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' already pulled
+             # 'bash' OpenJDK scripts are explicitly Bash
+checkdepends=()
+_url_src=http://hg.openjdk.java.net/jdk-updates/jdk9u
+source=("jdk9u-${_repo_ver}.tar.gz::$_url_src/archive/$_hg_tag.tar.gz"
+        "corba-${_repo_ver}.tar.gz::$_url_src/corba/archive/$_hg_tag.tar.gz"
+        "hotspot-${_repo_ver}.tar.gz::$_url_src/hotspot/archive/$_hg_tag.tar.gz"
+        "jaxp-${_repo_ver}.tar.gz::$_url_src/jaxp/archive/$_hg_tag.tar.gz"
+        "jaxws-${_repo_ver}.tar.gz::$_url_src/jaxws/archive/$_hg_tag.tar.gz"
+        "jdk-${_repo_ver}.tar.gz::$_url_src/jdk/archive/$_hg_tag.tar.gz"
+        "langtools-${_repo_ver}.tar.gz::$_url_src/langtools/archive/$_hg_tag.tar.gz"
+        "nashorn-${_repo_ver}.tar.gz::$_url_src/nashorn/archive/$_hg_tag.tar.gz"
+        freedesktop-java.desktop
+        freedesktop-jconsole.desktop
+        freedesktop-policytool.desktop
+        jdk9u-jdk-9.0.4+12-make43.patch
+        jdk-jdk-9.0.4+12-gcc10-default-no-fcommon.patch
+        hotspot-jdk-9.0.4+12-bitmap-segv.patch
+        hotspot-jdk-9.0.4+12-c1.patch
+        )
+sha256sums=('508ea8854da2260a5b5bf226533d1efdacc70df5b2061a8dc02ebfcee7cf161a'
+            '13db0d5039757d67aa10f972a96019fad917af3080ed65f37fdf55a17f2ba890'
+            '7ba43e5f328a4c83ac7cd7097db6779ab40c8c5689a9139cccd363419d6bad3c'
+            'b55350eef3dc9fc191373db4975b53f3bbed387e8634b37694db98c1e313da1a'
+            'f649a8dcdb42122212773b181ad8d2d7e8e7d1dd2e6b3517e0e46018d8d52ad4'
+            '708cc3e5613a7341b0dad477d7fcfa1f70d38e2ac14484c1f13ff9f19a2ca998'
+            'b112d33f6e74387e34b0cd6f7da892538b67d70e0075d918f7e68e732cb6b89b'
+            '0732a1c0379a5e0849c419e325d78e5636cc59a6122713e9f701c2f0f7a7d57c'
+            '85d32321fb59a89e4f9ab320060597d4ca9d5e23b995c61549a48b41ac908a67'
+            'bf197deb003879ed01adc6973a2430a41574f638667a5ecfbb1aad1403897ddc'
+            '9394de47b5c38826ab837145816667d96b697998bafec5dd132d39d4846ac70e'
+            '4935390ee360b62dd059e8163ef598441c41471e79c76e212b01cdb32fe0e3b9'
+            'dccab9e9a30d838dcb76e799443c914f48677aa7a3c4e3549bb4190ffcbbd67e'
+            'becfe6b7dd08e4572f1ce62e1f1d37304b5e52ad6baa0be0e37f323249f2a003'
+            'c9b79eb1af2efd57c5e639b37774e12b2026a474d210a20f770e304e57a63c6b'
+            )
+
+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,diz}
+              lib/libjawt.{so,diz}
+              lib/libjsoundalsa.{so,diz}
+              lib/libsplashscreen.{so,diz})
+#_nonheadless=(
+#  "${_nonheadless[@]/\/\///${_JARCH}/}"
+#)
+
+prepare() {
+  cd $_jdkdir
+  for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
+  do
+    ln -s ../$subrepo-$_hg_tag $subrepo
+  done
+  # see https://bugs.openjdk.java.net/browse/JDK-8237879
+  patch -Np1 < $srcdir/jdk9u-jdk-9.0.4+12-make43.patch
+
+  # some gcc 10 issues and backports of known bugs
+  pushd jdk
+  patch -Np1 < $srcdir/jdk-jdk-9.0.4+12-gcc10-default-no-fcommon.patch
+  popd
+  pushd hotspot
+  patch -Np1 < $srcdir/hotspot-jdk-9.0.4+12-bitmap-segv.patch
+  patch -Np1 < $srcdir/hotspot-jdk-9.0.4+12-c1.patch
+  popd
+}
+
+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/jdk9/jdk9/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/}
+    NUM_PROC_OPT="--with-num-cores=$MAKEFLAG_J"
+  fi
+
+  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 "$pkgname-$pkgver"
+#   make -k check
+# }
+
+package_jre9-openjdk-headless() {
+  pkgdesc="OpenJDK Java $_majorver headless runtime environment"
+  depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss')
+  optdepends=('java-rhino: for some JavaScript support')
+  provides=("java-runtime-headless=$_majorver" "java-runtime-headless-openjdk=$_majorver")
+  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_jre9-openjdk-headless.sh
+
+  cd $_imgdir/jre
+
+  install -d -m 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 -d -m 755 "$pkgdir/etc"
+  cp -r conf "$pkgdir/etc/$pkgbase"
+  ln -s /etc/$pkgbase "$pkgdir/$_jvmdir/conf"
+
+  # Legal
+  install -d -m 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 -D -m 644 $f "$pkgdir/usr/share/${f/\.1/-openjdk9.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"
+
+  find "$pkgdir$_jvmdir" -iname '*.diz' -exec rm {} \;
+}
+
+package_jre9-openjdk() {
+  pkgdesc="OpenJDK Java $_majorver full runtime environment"
+  depends=("jre$_majorver-openjdk-headless=$_pkg_full_ver")
+  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")
+  install=install_jre9-openjdk.sh
+
+  cd $_imgdir/jre
+
+  install -d -m 755 "$pkgdir$_jvmdir"
+
+  for f in ${_nonheadless[@]}; do
+    install -D -m 644 $f "$pkgdir$_jvmdir/$f"
+  done
+
+  # Licenses
+  install -d -m 755 "$pkgdir/usr/share/licenses"
+  ln -s $pkgbase "$pkgdir/usr/share/licenses/$pkgname"
+
+  find "$pkgdir$_jvmdir" -iname '*.diz' -exec rm {} \;
+}
+
+package_jdk9-openjdk() {
+  pkgdesc="OpenJDK Java $_majorver development kit"
+  depends=("jre$_majorver-openjdk=$_pkg_full_ver" 'java-environment-common=3' 'hicolor-icon-theme' 'libelf')
+  provides=("java-environment=$_majorver" "java-environment-openjdk=$_majorver")
+  install=install_jdk9-openjdk.sh
+
+  cd $_imgdir/jdk
+
+  install -d -m 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 -d -m 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 -D -m 644 $f "$pkgdir/usr/share/${f/\.1/-openjdk$_majorver.1}"
+    fi
+  done
+
+  # Icons
+  for s in 16 24 32 48; do
+    install -D -m 644 \
+      $srcdir/jdk-$_hg_tag/src/java.desktop/unix/classes/sun/awt/X11/java-icon$s.png \
+      "$pkgdir/usr/share/icons/hicolor/$sx$s/apps/$pkgbase.png"
+  done
+
+  # Desktop files
+  for f in jconsole policytool java; do
+    install -D -m 644 \
+      "$srcdir/freedesktop-$f.desktop" \
+      "$pkgdir/usr/share/applications/$f-$pkgbase.desktop"
+  done
+
+  find "$pkgdir$_jvmdir" -iname '*.diz' -exec rm {} \;
+}
+
+package_openjdk9-src() {
+  pkgdesc="OpenJDK Java $_majorver sources"
+  # Depends on JDK to get license files
+  depends=("jdk$_majorver-openjdk=$_pkg_full_ver")
+
+  install -D -m 644 -t "$pkgdir$_jvmdir/lib" $_imgdir/jdk/lib/src.zip
+
+  install -d -m 755 "$pkgdir/usr/share/licenses"
+  ln -s $pkgbase "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+package_openjdk9-doc() {
+  pkgdesc="OpenJDK Java $_majorver documentation"
+  # Depends on JDK to get license files
+  depends=("jdk$_majorver-openjdk=$_pkg_full_ver")
+
+  install -d -m 755 "$pkgdir/usr/share/doc"
+  cp -r $_imgdir/docs "$pkgdir/usr/share/doc/$pkgbase"
+
+  install -d -m 755 "$pkgdir/usr/share/licenses"
+  ln -s $pkgbase "$pkgdir/usr/share/licenses/$pkgname"
+}
diff --git a/build-support/java9-openjdk/freedesktop-java.desktop b/build-support/java9-openjdk/freedesktop-java.desktop
new file mode 100644
index 00000000..0479c92b
--- /dev/null
+++ b/build-support/java9-openjdk/freedesktop-java.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=OpenJDK Java 9 Runtime
+Name[fi]=OpenJDK Java 9 - ajonaikainen ympäristö
+Comment=OpenJDK Java 9 Runtime
+Comment[fi]=OpenJDK Java 9 - ajonaikainen ympäristö
+Keywords=java;runtime
+Exec=/usr/lib/jvm/java-9-openjdk/bin/java -jar
+Terminal=false
+Type=Application
+Icon=java9-openjdk
+MimeType=application/x-java-archive;application/java-archive;application/x-jar;
+NoDisplay=true
diff --git a/build-support/java9-openjdk/freedesktop-jconsole.desktop b/build-support/java9-openjdk/freedesktop-jconsole.desktop
new file mode 100644
index 00000000..0a83b0a9
--- /dev/null
+++ b/build-support/java9-openjdk/freedesktop-jconsole.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=OpenJDK Java 9 Console
+Name[fi]=OpenJDK Java 9 - konsoli
+Comment=OpenJDK Java 9 Monitoring & Management Console
+Comment[fi]=OpenJDK Java 9 - valvonta- ja hallintakonsoli
+Keywords=java;console;monitoring
+Exec=/usr/lib/jvm/java-9-openjdk/bin/jconsole
+Terminal=false
+Type=Application
+Icon=java9-openjdk
+Categories=Application;System;
diff --git a/build-support/java9-openjdk/freedesktop-policytool.desktop b/build-support/java9-openjdk/freedesktop-policytool.desktop
new file mode 100644
index 00000000..e1c400f4
--- /dev/null
+++ b/build-support/java9-openjdk/freedesktop-policytool.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=OpenJDK Java 9 Policy Tool
+Name[fi]=OpenJDK Java 9 - käytäntötyökalu
+Name[fr]=OpenJDK Java 9 - Outil de réglage
+Comment=OpenJDK Java 9 Policy Tool
+Comment[fi]=OpenJDK Java 9 - käytäntötyökalu
+Comment[fr]=OpenJDK Java 9 - Outil de réglage
+Keywords=java;security;policytool
+Exec=/usr/lib/jvm/java-9-openjdk/bin/policytool
+Terminal=false
+Type=Application
+Icon=java9-openjdk
+Categories=Settings;
diff --git a/build-support/java9-openjdk/hotspot-jdk-9.0.4+12-bitmap-segv.patch b/build-support/java9-openjdk/hotspot-jdk-9.0.4+12-bitmap-segv.patch
new file mode 100644
index 00000000..7e325af2
--- /dev/null
+++ b/build-support/java9-openjdk/hotspot-jdk-9.0.4+12-bitmap-segv.patch
@@ -0,0 +1,27 @@
+diff -rauN hotspot-jdk-9.0.4+12/src/share/vm/utilities/bitMap.cpp hotspot-jdk-9.0.4+12-bitmap-segv-patch/src/share/vm/utilities/bitMap.cpp
+--- hotspot-jdk-9.0.4+12/src/share/vm/utilities/bitMap.cpp	2018-01-22 16:19:02.000000000 +0100
++++ hotspot-jdk-9.0.4+12-bitmap-segv-patch/src/share/vm/utilities/bitMap.cpp	2021-05-16 16:22:06.049850445 +0200
+@@ -78,8 +78,10 @@
+   if (new_size_in_words > 0) {
+     map = allocator.allocate(new_size_in_words);
+ 
+-    Copy::disjoint_words((HeapWord*)old_map, (HeapWord*) map,
+-                         MIN2(old_size_in_words, new_size_in_words));
++    if (old_map != NULL) {
++      Copy::disjoint_words((HeapWord*)old_map, (HeapWord*) map,
++                           MIN2(old_size_in_words, new_size_in_words));
++    }
+ 
+     if (new_size_in_words > old_size_in_words) {
+       clear_range_of_words(map, old_size_in_words, new_size_in_words);
+@@ -543,7 +545,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/java9-openjdk/hotspot-jdk-9.0.4+12-c1.patch b/build-support/java9-openjdk/hotspot-jdk-9.0.4+12-c1.patch
new file mode 100644
index 00000000..d1a6524a
--- /dev/null
+++ b/build-support/java9-openjdk/hotspot-jdk-9.0.4+12-c1.patch
@@ -0,0 +1,57 @@
+diff -rauN hotspot-jdk-9.0.4+12/src/share/vm/c1/c1_Instruction.hpp hotspot-jdk-9.0.4+12-c1-patch/src/share/vm/c1/c1_Instruction.hpp
+--- hotspot-jdk-9.0.4+12/src/share/vm/c1/c1_Instruction.hpp	2018-01-22 16:19:02.000000000 +0100
++++ hotspot-jdk-9.0.4+12-c1-patch/src/share/vm/c1/c1_Instruction.hpp	2021-05-16 18:08:52.629495872 +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 hotspot-jdk-9.0.4+12/src/share/vm/c1/c1_ValueMap.cpp hotspot-jdk-9.0.4+12-c1-patch/src/share/vm/c1/c1_ValueMap.cpp
+--- hotspot-jdk-9.0.4+12/src/share/vm/c1/c1_ValueMap.cpp	2018-01-22 16:19:02.000000000 +0100
++++ hotspot-jdk-9.0.4+12-c1-patch/src/share/vm/c1/c1_ValueMap.cpp	2021-05-16 18:09:20.186147327 +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/java9-openjdk/jdk-jdk-9.0.4+12-gcc10-default-no-fcommon.patch b/build-support/java9-openjdk/jdk-jdk-9.0.4+12-gcc10-default-no-fcommon.patch
new file mode 100644
index 00000000..43102aaa
--- /dev/null
+++ b/build-support/java9-openjdk/jdk-jdk-9.0.4+12-gcc10-default-no-fcommon.patch
@@ -0,0 +1,87 @@
+diff -rauN jdk-jdk-9.0.4+12/src/java.base/unix/native/libjava/childproc.c jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.c
+--- jdk-jdk-9.0.4+12/src/java.base/unix/native/libjava/childproc.c	2018-01-13 03:07:38.000000000 +0100
++++ jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.c	2021-05-16 14:34:22.286800941 +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 jdk-jdk-9.0.4+12/src/java.base/unix/native/libjava/childproc.h jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.h
+--- jdk-jdk-9.0.4+12/src/java.base/unix/native/libjava/childproc.h	2018-01-13 03:07:38.000000000 +0100
++++ jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.h	2021-05-16 14:34:53.816831584 +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 jdk-jdk-9.0.4+12/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c
+--- jdk-jdk-9.0.4+12/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c	2018-01-13 03:07:38.000000000 +0100
++++ jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c	2021-05-16 14:49:58.261235281 +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 jdk-jdk-9.0.4+12/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h
+--- jdk-jdk-9.0.4+12/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h	2018-01-13 03:07:38.000000000 +0100
++++ jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h	2021-05-16 14:50:08.671248326 +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 jdk-jdk-9.0.4+12/src/jdk.sctp/unix/native/libsctp/Sctp.h jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/Sctp.h
+--- jdk-jdk-9.0.4+12/src/jdk.sctp/unix/native/libsctp/Sctp.h	2018-01-13 03:07:38.000000000 +0100
++++ jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/Sctp.h	2021-05-16 15:40:57.905491930 +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 jdk-jdk-9.0.4+12/src/jdk.sctp/unix/native/libsctp/SctpNet.c jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/SctpNet.c
+--- jdk-jdk-9.0.4+12/src/jdk.sctp/unix/native/libsctp/SctpNet.c	2018-01-13 03:07:38.000000000 +0100
++++ jdk-jdk-9.0.4+12-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/SctpNet.c	2021-05-16 15:42:27.565614895 +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/java9-openjdk/jdk9u-jdk-9.0.4+12-make43.patch b/build-support/java9-openjdk/jdk9u-jdk-9.0.4+12-make43.patch
new file mode 100644
index 00000000..b8440634
--- /dev/null
+++ b/build-support/java9-openjdk/jdk9u-jdk-9.0.4+12-make43.patch
@@ -0,0 +1,24 @@
+diff -rauN jdk9u-jdk-9.0.4+12/make/common/MakeBase.gmk jdk9u-jdk-9.0.4+12-make43-patch/make/common/MakeBase.gmk
+--- jdk9u-jdk-9.0.4+12/make/common/MakeBase.gmk	2017-12-20 00:25:20.000000000 +0100
++++ jdk9u-jdk-9.0.4+12-make43-patch/make/common/MakeBase.gmk	2021-05-16 08:48:07.503289305 +0200
+@@ -897,15 +897,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