OpenJDK - version 20

Author: psumbera

README.md

@@ -1,6 +1,6 @@
 # Oracle Solaris OpenJDK Builder
 
-This project builds all OpenJDK versions from 9 till latest 19 for Solaris 11.4.
+This project builds all OpenJDK versions from 9 till latest 20 for Solaris 11.4.
 
 Note that this was done based on great job of Peter Tribble:
 https://ptribble.blogspot.com/2021/12/keeping-java-alive-on-illumos.html

archives.sh

@@ -10,7 +10,7 @@ else
   JDK_PLATFORM="x86_64"
 fi
 
-for VERSION in {9..19}; do
+for VERSION in {9..20}; do
   if [ $VERSION -lt 12 ] ; then
     JAVADIR="./build_dir/jdk${VERSION}u/build/solaris-$JDK_PLATFORM-normal-server-release/images/jdk"
   else

build-all.sh

@@ -18,7 +18,7 @@ for i in "$@"; do
   esac
 done
 
-for VERSION in {9..19}; do
+for VERSION in {9..20}; do
 
   if [ $VERSION -lt $BUILD_FROM_VER ] ; then
     echo "Skipping Openjdk $VERSION build."

jdk-20.sh

@@ -0,0 +1,29 @@
+set -xe
+
+VERSION=20
+
+. common.sh
+
+PATH="/usr/bin:/usr/gnu/bin"
+
+CONFIGURE_OPTIONS+=" --enable-unlimited-crypto"
+CONFIGURE_OPTIONS+=" --enable-deprecated-ports=yes"
+CONFIGURE_OPTIONS+=" --with-boot-jdk=$BOOT_JDK"
+CONFIGURE_OPTIONS+=" --with-native-debug-symbols=none"
+CONFIGURE_OPTIONS+=" --with-toolchain-type=gcc"
+CONFIGURE_OPTIONS+=" --disable-dtrace"
+CONFIGURE_OPTIONS+=" --disable-warnings-as-errors"
+CONFIGURE_OPTIONS+=" --with-source-date=current"
+CONFIGURE_OPTIONS+=" AS=/usr/gnu/bin/as"
+CONFIGURE_OPTIONS+=" CC=$GCC"
+CONFIGURE_OPTIONS+=" CXX=$GXX"
+CONFIGURE_OPTIONS+=" DATE=/usr/gnu/bin/date"
+
+git clone ${JDK_GITHUB_REPO}/$SRC_DIR "$BUILD_DIR"/$SRC_DIR
+cd "$BUILD_DIR"/$SRC_DIR
+git checkout jdk-20+36
+
+apply_patch_series
+
+PATH="$PATH" bash ./configure ${CONFIGURE_OPTIONS} 
+gmake bundles 

mirror.sh

@@ -10,6 +10,7 @@ git -C jdk16u pull 2>/dev/null || git clone https://github.com/openjdk/jdk16u
 git -C jdk17u pull 2>/dev/null || git clone https://github.com/openjdk/jdk17u
 git -C jdk18u pull 2>/dev/null || git clone https://github.com/openjdk/jdk18u
 git -C jdk19u pull 2>/dev/null || git clone https://github.com/openjdk/jdk19u
+git -C jdk20u pull 2>/dev/null || git clone https://github.com/openjdk/jdk20u
 # Downloads build tools.
 test -f make-4.2.1.tar.bz2 || wget https://ftp.gnu.org/gnu/make/make-4.2.1.tar.bz2
 test -f autoconf-2.69.tar.xz || wget https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz

patches-20/README-removal.txt

@@ -0,0 +1,34 @@
+15+24 was tagged after the solaris/sparc removal but didn't actually
+include it, it was based on a slightly earlier commit.
+
+However, this is a set of notes on how the removal is being addressed
+http://cr.openjdk.java.net/~mikael/webrevs/8244224/webrev.final/open/webrev/
+it's therefore relatively trivial to revert the removal at this point
+
+The patch there was:
+
+wc java-solaris-sparc.patch
+  143793  691143 5454385 java-solaris-sparc.patch
+
+And there are 953 files affected by the patch
+
+grep '^---' java-solaris-sparc.patch | awk '{print $2}' | wc -l
+     953
+
+297 of those are under test, we probably don't want them (for now, at
+any rate)
+
+214 are sparc, which again we don't want
+
+There are some mac/bsd/linux patches left after that
+
+Overall, we want less that half the files in the patch, based on
+filename alone.
+
+It turns out that gpatch couldn't cope with the original
+patch. Rebuilt it as 64-bit and it was much happier.
+
+For 15+26, I've trimmed about 2/3 of java-solaris-sparc.patch
+This is mostly about not restoring SPARC, there's still quite a lot
+more cleanup we could do. Also, we shouldn't have to separately patch
+the files we created by applying the main patch.

patches-20/README-zero.txt

@@ -0,0 +1,47 @@
+"Zero is a port of OpenJDK that uses no assembler and therefore can
+trivially be built on any system."
+
+https://openjdk.java.net/projects/zero/
+
+The idea here is to potentially have an illumos port of zero. It's not
+so interesting on x86, for which we have a proper port anyway, but if
+we can get zero to work on x86 then it should be possible to get it to
+work on sparc too.
+
+It still needs the basic solaris patchset. It's designed more to support
+new hardware architectures (hence the zero assembler) than as a way to
+do an OS port.
+
+There are 2 patches:
+
+illumos-zero-1.patch
+Fixes src/hotspot/cpu/zero/stubGenerator_zero.cpp
+
+illumos-zero-2.patch
+Adds the src/hotspot/os_cpu/solaris_zero directory and contents
+
+These are current and tested for jdk 20+15. They don't provide a
+proper zero port, as they still have x86 assembler that needs to be
+removed. But this provides a starting point.
+
+The two patches above are now applied by default, so we at least catch
+any incompatibilities early.
+
+Configure:
+
+env PATH=/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/gnu/bin bash ./configure \
+--enable-unlimited-crypto --with-boot-jdk=/usr/jdk/instances/jdk18 \
+--with-native-debug-symbols=none \
+--with-toolchain-type=gcc \
+--disable-dtrace \
+--disable-warnings-as-errors \
+--enable-deprecated-ports=yes \
+--enable-jvm-feature-zero --with-jvm-variants=zero \
+--with-source-date=current \
+--with-jobs=3 \
+DATE=/usr/gnu/bin/date
+
+
+build:
+
+env PATH=/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/gnu/bin gmake all CONF=solaris-x86_64-zero-release