added java12-openjdk to build-support

10 files changed, 632 insertions, 0 deletions

diff --git a/build-support/java12-openjdk/PKGBUILD b/build-support/java12-openjdk/PKGBUILD
new file mode 100644
index 00000000..d8710f51
--- /dev/null
+++ b/build-support/java12-openjdk/PKGBUILD
@@ -0,0 +1,306 @@
+# 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
+
+pkgbase=java12-openjdk
+pkgname=('jre12-openjdk-headless' 'jre12-openjdk' 'jdk12-openjdk' 'openjdk12-src' 'openjdk12-doc')
+_majorver=12
+_minorver=0
+_securityver=2
+_updatever=10
+pkgrel=1
+pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+arch=('x86_64' 'i486' 'i686' 'pentium4')
+url='https://openjdk.java.net/'
+license=('custom')
+makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
+             'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' '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
+        jdk12u-jdk-12.0.2+10-make43.patch
+        jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon.patch
+        jdk12u-jdk-12.0.2+10-c1.patch
+        )
+sha256sums=('b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb'
+            '779dba7cf4f5de7cd512adf969354ec4aefddb33d970757eb3c49ea1fd8d5184'
+            'fa67642a8ba1173c30536a12dfbeeacf5d0f37918849057c1049b88a81f261ed'
+            '0a1d66a3e4774d7fad267c8a4e726ecf362ae2f33df12439567e0fb249655c48'
+            'c41c32ec668f5ae79d360c9437aca0574481ecbb3d346b8efe6b2ca5c59c0238'
+            'd2df8c2294753e10b0cf266fe2028bd59a71f480096fe259731d3b284177daa5'
+            '61e3ec58190f19feb068e6ad21469cce2fd9867079fd5f6e9a32cefb70600cf9'
+            )
+
+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}-server-release/images
+_imgdir="${_imgdir//--/-${_JARCH}-}"
+
+_nonheadless=(lib/libawt_xawt.{so,debuginfo}
+              lib/libjawt.{so,debuginfo}
+              lib/libjsound.{so,debuginfo}
+              lib/libsplashscreen.{so,debuginfo})
+#_nonheadless=(
+#  "${_nonheadless[@]/\/\///${_JARCH}/}"
+#)
+
+prepare() {
+  cd ${_jdkdir}
+
+  # see https://bugs.openjdk.java.net/browse/JDK-8237879
+  patch -Np1 < $srcdir/jdk12u-jdk-12.0.2+10-make43.patch
+  
+  # some gcc 10 issues and backports of known bugs
+  patch -Np1 < $srcdir/jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon.patch
+  patch -Np1 < $srcdir/jdk12u-jdk-12.0.2+10-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}/}
+    NUM_PROC_OPT="--with-num-cores=${MAKEFLAG_J}"
+  fi
+
+  # Avoid optimization of HotSpot to be 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
+  fi
+
+  # pentium4-specific
+  if [ "${CARCH}" = "pentium4" ]; then
+    _JARCH=i386
+    # 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 \
+    --with-jvm-features=zgc \
+    --enable-unlimited-crypto \
+    --disable-warnings-as-errors \
+    ${NUM_PROC_OPT}
+    #--disable-javac-server
+
+  make images legacy-jre-image docs
+
+  # https://bugs.openjdk.java.net/browse/JDK-8173610
+  find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \;
+}
+
+check() {
+  cd jdk${_majorver}u-${_hg_tag}
+  # TODO package jtreg
+  # make -k check
+}
+
+package_jre12-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}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
+  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_jre-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 bin/*; do
+    f=$(basename "${f}")
+    _man=../jdk/man/man1/"${f}.1"
+    test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.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_jre12-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}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}")
+  install=install_jre-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_jdk12-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}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+  install=install_jdk-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 bin/*; do
+    f=$(basename "${f}")
+    _man=man/man1/"${f}.1"
+    test -f "../jre/bin/${f}" && continue
+    test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
+  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_openjdk12-src() {
+  pkgdesc="OpenJDK Java ${_majorver} sources"
+  # Depends on JDK to get license files
+  depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+  provides=("openjdk${_majorver}-src=${pkgver}-${pkgrel}")
+
+  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_openjdk12-doc() {
+  pkgdesc="OpenJDK Java ${_majorver} documentation"
+  # Depends on JDK to get license files
+  depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+  provides=("openjdk${_majorver}-doc=${pkgver}-${pkgrel}")
+
+  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/java12-openjdk/freedesktop-java.desktop b/build-support/java12-openjdk/freedesktop-java.desktop
new file mode 100644
index 00000000..acd8701d
--- /dev/null
+++ b/build-support/java12-openjdk/freedesktop-java.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=OpenJDK Java 12 Runtime
+Name[fi]=OpenJDK Java 12 - ajonaikainen ympäristö
+Comment=OpenJDK Java 12 Runtime
+Comment[fi]=OpenJDK Java 12 - ajonaikainen ympäristö
+Keywords=java;runtime
+Exec=/usr/lib/jvm/java-12-openjdk/bin/java -jar
+Terminal=false
+Type=Application
+Icon=java12-openjdk
+MimeType=application/x-java-archive;application/java-archive;application/x-jar;
+NoDisplay=true
diff --git a/build-support/java12-openjdk/freedesktop-jconsole.desktop b/build-support/java12-openjdk/freedesktop-jconsole.desktop
new file mode 100644
index 00000000..acb6472d
--- /dev/null
+++ b/build-support/java12-openjdk/freedesktop-jconsole.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=OpenJDK Java 12 Console
+Name[fi]=OpenJDK Java 12 - konsoli
+Comment=OpenJDK Java 12 Monitoring & Management Console
+Comment[fi]=OpenJDK Java 12 - valvonta- ja hallintakonsoli
+Keywords=java;console;monitoring
+Exec=/usr/lib/jvm/java-12-openjdk/bin/jconsole
+Terminal=false
+Type=Application
+Icon=java12-openjdk
+Categories=Application;System;
diff --git a/build-support/java12-openjdk/freedesktop-jshell.desktop b/build-support/java12-openjdk/freedesktop-jshell.desktop
new file mode 100644
index 00000000..16110b86
--- /dev/null
+++ b/build-support/java12-openjdk/freedesktop-jshell.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=OpenJDK Java 12 Shell
+Comment=OpenJDK Java 12 Shell
+Keywords=java;shell
+Exec=/usr/lib/jvm/java-12-openjdk/bin/jshell
+Terminal=true
+Type=Application
+Icon=java12-openjdk
+Categories=Application;System;
diff --git a/build-support/java12-openjdk/install_jdk-openjdk.sh b/build-support/java12-openjdk/install_jdk-openjdk.sh
new file mode 100644
index 00000000..cf97693a
--- /dev/null
+++ b/build-support/java12-openjdk/install_jdk-openjdk.sh
@@ -0,0 +1,50 @@
+THIS_JDK='java-12-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 JRE 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/java12-openjdk/install_jre-openjdk-headless.sh b/build-support/java12-openjdk/install_jre-openjdk-headless.sh
new file mode 100644
index 00000000..a340d0be
--- /dev/null
+++ b/build-support/java12-openjdk/install_jre-openjdk-headless.sh
@@ -0,0 +1,48 @@
+THIS_JRE='java-12-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/java12-openjdk/install_jre-openjdk.sh b/build-support/java12-openjdk/install_jre-openjdk.sh
new file mode 100644
index 00000000..03d45d07
--- /dev/null
+++ b/build-support/java12-openjdk/install_jre-openjdk.sh
@@ -0,0 +1,35 @@
+THIS_JRE='java-12-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/java12-openjdk/jdk12u-jdk-12.0.2+10-c1.patch b/build-support/java12-openjdk/jdk12u-jdk-12.0.2+10-c1.patch
new file mode 100644
index 00000000..597c76ba
--- /dev/null
+++ b/build-support/java12-openjdk/jdk12u-jdk-12.0.2+10-c1.patch
@@ -0,0 +1,51 @@
+diff -rauN jdk12u-jdk-12.0.2+10/src/hotspot/share/c1/c1_Instruction.hpp jdk12u-jdk-12.0.2+10-c1-patch/src/hotspot/share/c1/c1_Instruction.hpp
+--- jdk12u-jdk-12.0.2+10/src/hotspot/share/c1/c1_Instruction.hpp	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10-c1-patch/src/hotspot/share/c1/c1_Instruction.hpp	2021-05-19 16:54:56.288783039 +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,11 +408,11 @@
+ 
+   // creation
+   Instruction(ValueType* type, ValueStack* state_before = NULL, bool type_is_constant = false)
+-  :
++  : _id(Compilation::current()->get_next_id())
++  , _use_count(0)
+ #ifndef PRODUCT
+-  _printable_bci(-99),
++  , _printable_bci(-99)
+ #endif
+-    _use_count(0)
+   , _pin_state(0)
+   , _type(type)
+   , _next(NULL)
+@@ -1649,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;
+   }
+ 
+@@ -1662,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 --git a/build-support/java12-openjdk/jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon.patch b/build-support/java12-openjdk/jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon.patch
new file mode 100644
index 00000000..a15870e2
--- /dev/null
+++ b/build-support/java12-openjdk/jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon.patch
@@ -0,0 +1,86 @@
+diff -rauN jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.c jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.c
+--- jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.c	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.c	2021-05-19 16:33:32.193463845 +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 jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.h jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.h
+--- jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.h	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.h	2021-05-19 16:33:45.056818223 +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 jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.c jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
+--- jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.c	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.security.jgss/share/native/libj2gss/NativeFunc.c	2021-05-19 16:36:27.850415027 +0200
+@@ -27,6 +27,9 @@
+ #include <stdlib.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 jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.h jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
+--- jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.h	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.security.jgss/share/native/libj2gss/NativeFunc.h	2021-05-19 16:35:59.263702472 +0200
+@@ -277,6 +277,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 jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/Sctp.h jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/Sctp.h
+--- jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/Sctp.h	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/Sctp.h	2021-05-19 16:37:45.070538192 +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 jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/SctpNet.c jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/SctpNet.c
+--- jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/SctpNet.c	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/SctpNet.c	2021-05-19 16:38:27.413938578 +0200
+@@ -37,6 +37,13 @@
+ #include "sun_nio_ch_sctp_SctpNet.h"
+ #include "sun_nio_ch_sctp_SctpStdSocketOption.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;
++
+ static jclass isaCls = 0;
+ static jmethodID isaCtrID = 0;
+ 
diff --git a/build-support/java12-openjdk/jdk12u-jdk-12.0.2+10-make43.patch b/build-support/java12-openjdk/jdk12u-jdk-12.0.2+10-make43.patch
new file mode 100644
index 00000000..998afc6b
--- /dev/null
+++ b/build-support/java12-openjdk/jdk12u-jdk-12.0.2+10-make43.patch
@@ -0,0 +1,24 @@
+diff -rauN jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk jdk12u-jdk-12.0.2+10-make43-patch/make/common/MakeBase.gmk
+--- jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10-make43-patch/make/common/MakeBase.gmk	2021-05-19 14:33:26.193326369 +0200
+@@ -977,15 +977,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