jdk-25.0.1-ga, jdk-21.0.9-ga and jdk-17.0.17-ga

Author: psumbera

.github/workflows/openjdk-25.yml

@@ -0,0 +1,46 @@
+name: OpenJDK 25
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'archives.sh'
+      - 'common.sh'
+      - 'jdk-25.sh'
+      - 'patches-25/**'
+  pull_request:
+
+jobs:
+  build-on-solaris:
+    name: Build & Archive on Solaris
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build project inside Solaris VM
+        uses: vmactions/[email protected]
+        with:
+          release: "11.4-gcc"
+          usesh: true
+          sync: nfs
+          copyback: false
+          prepare: |
+            uname -a
+          run: |
+            REPO=`pwd`
+            # avoid problems when building on NFS from Linux
+            git clone $REPO /var/tmp/openjdk
+            cd /var/tmp/openjdk
+            # download bootstrap JDK version
+            curl -o jdk-24-bootstrap.tar.xz --progress-bar -L https://github.com/psumbera/solaris-openjdk/releases/download/openjdk24-i386-bootstrap/openjdk-24.0.2-bootstrap_SunOS-i386_bin.tar.xz
+            gtar xf jdk-24-bootstrap.tar.xz
+            BOOT_JDK=$(pwd)/jdk-24-bootstrap bash jdk-25.sh
+            ./archives.sh
+            # copy archive back to NFS shared area
+            mkdir $REPO/archives
+            mv archives/* $REPO/archives/
+
+      - name: Upload Solaris build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: openjdk-25-latest_SunOS-i386_bin
+          path: archives/*

bootstrap-lts-jdk.sh

@@ -15,12 +15,15 @@ arch=$(uname -m)
 
 if [[ "$VERSION" -eq 17 ]]; then
     BOOTSRAP_OPENJDK_URL=${GITHUB_URL}/openjdk${BOOTSTRAP_VERSION}-bootstrap/openjdk-${BOOTSTRAP_VERSION}.0.2-bootstrap_SunOS-`mach`_bin.tar.xz
-    total_lines=73880
+    total_lines=`mach | grep i386 > /dev/null && echo 133647 || echo 133139`
 elif [[ "$VERSION" -eq 21 && "$arch" == "i86pc" ]]; then
     BOOTSRAP_OPENJDK_URL=${GITHUB_URL}/openjdk${BOOTSTRAP_VERSION}-i386-bootstrap/openjdk-${BOOTSTRAP_VERSION}-bootstrap_SunOS-i386_bin.tar.xz
-    total_lines=101875
+    total_lines=101891
+elif [[ "$VERSION" -eq 25 && "$arch" == "i86pc" ]]; then
+    BOOTSRAP_OPENJDK_URL=${GITHUB_URL}/openjdk${BOOTSTRAP_VERSION}-i386-bootstrap/openjdk-${BOOTSTRAP_VERSION}.0.2-bootstrap_SunOS-i386_bin.tar.xz
+    total_lines=126740
 else
-    echo "Only OpenJDK 17 and 21 (i386) versions build is supported." >&2
+    echo "Only OpenJDK 17, 21 (i386) and 25 (i386) versions builds are supported." >&2
     exit 1
 fi
 

jdk-17.sh

@@ -20,7 +20,7 @@ CONFIGURE_OPTIONS+=" CXX=$GXX"
 
 git clone ${JDK_GITHUB_REPO}/$SRC_DIR "$BUILD_DIR"/$SRC_DIR
 cd "$BUILD_DIR"/$SRC_DIR
-git checkout jdk-17.0.16-ga
+git checkout jdk-17.0.17-ga
 
 apply_patch_series
 

jdk-21.sh

@@ -21,7 +21,7 @@ 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-21.0.8-ga
+git checkout jdk-21.0.9-ga
 
 apply_patch_series
 

jdk-25.sh

@@ -22,7 +22,7 @@ CONFIGURE_OPTIONS+=" LOCALE=/bin/true"
 
 git clone ${JDK_GITHUB_REPO}/$SRC_DIR "$BUILD_DIR"/$SRC_DIR
 cd "$BUILD_DIR"/$SRC_DIR
-git checkout jdk-25-ga
+git checkout jdk-25.0.1-ga
 
 apply_patch_series
 

patches-17/0001-8282477-x86-aarch64-vmassert-_last_Java_pc-NULL-alre.patch

@@ -286,7 +286,7 @@ diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/th
 index 8aed9a450b6..50ecc4d4688 100644
 --- a/src/hotspot/share/runtime/thread.cpp
 +++ b/src/hotspot/share/runtime/thread.cpp
-@@ -1677,7 +1677,7 @@ void JavaThread::check_and_handle_async_exceptions() {
+@@ -1676,7 +1676,7 @@ void JavaThread::check_and_handle_async_exceptions() {
  void JavaThread::handle_special_runtime_exit_condition(bool check_asyncs) {
 
    if (is_obj_deopt_suspend()) {
@@ -299,7 +299,7 @@ diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/th
 index 9700d6be2a5..9a3fe0efe6e 100644
 --- a/src/hotspot/share/runtime/thread.hpp
 +++ b/src/hotspot/share/runtime/thread.hpp
-@@ -1429,7 +1429,7 @@ class JavaThread: public Thread {
+@@ -1428,7 +1428,7 @@ class JavaThread: public Thread {
   public:
    // Accessing frames
    frame last_frame() {

patches-17/0048-8256205-Simplify-compiler-calling-convention-handlin.patch

@@ -52,7 +52,7 @@ diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch6
 index a9df812c634..2ec3d26ac81 100644
 --- a/src/hotspot/cpu/aarch64/aarch64.ad
 +++ b/src/hotspot/cpu/aarch64/aarch64.ad
-@@ -4040,13 +4040,6 @@ frame %{
+@@ -4035,13 +4035,6 @@ frame %{
    // Stack alignment requirement
    stack_alignment(StackAlignmentInBytes); // Alignment size in bytes (128-bit -> 16 bytes)
 
@@ -66,7 +66,7 @@ index a9df812c634..2ec3d26ac81 100644
    // Number of outgoing stack slots killed above the out_preserve_stack_slots
    // for calls to C.  Supports the var-args backing area for register parms.
    varargs_C_out_slots_killed(frame::arg_reg_save_area_bytes/BytesPerInt);
-@@ -4065,25 +4058,6 @@ frame %{
+@@ -4060,25 +4053,6 @@ frame %{
                          Compile::current()->fixed_slots()),
                         stack_alignment_in_slots()));
 
@@ -244,7 +244,7 @@ diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
 index 27dad6cff94..8bbbc3d4aa3 100644
 --- a/src/hotspot/cpu/ppc/ppc.ad
 +++ b/src/hotspot/cpu/ppc/ppc.ad
-@@ -3775,8 +3775,6 @@ frame %{
+@@ -3776,8 +3776,6 @@ frame %{
 
    stack_alignment(frame::alignment_in_bytes);
 
@@ -253,7 +253,7 @@ index 27dad6cff94..8bbbc3d4aa3 100644
    // Number of outgoing stack slots killed above the
    // out_preserve_stack_slots for calls to C. Supports the var-args
    // backing area for register parms.
-@@ -3801,40 +3799,6 @@ frame %{
+@@ -3802,40 +3800,6 @@ frame %{
    //    4 what apparently works and saves us some spills.
    return_addr(STACK 4);
 
@@ -971,7 +971,7 @@ index 95369e6272e..ef2b688c7f1 100644
    BufferBlob* buf = buffer_blob(); // the temporary code buffer in CodeCache
    CodeBuffer buffer(buf);
    short buffer_locs[20];
-@@ -3075,11 +3074,8 @@ void AdapterHandlerLibrary::create_native_wrapper(const methodHandle& method) {
+@@ -3076,11 +3075,8 @@ void AdapterHandlerLibrary::create_native_wrapper(const methodHandle& method) {
        assert(si.slots() == total_args_passed, "");
        BasicType ret_type = si.return_type();
 
@@ -985,7 +985,7 @@ index 95369e6272e..ef2b688c7f1 100644
 
        // Generate the compiled-to-native wrapper code
        nm = SharedRuntime::generate_native_wrapper(&_masm, method, compile_id, sig_bt, regs, ret_type, critical_entry);
-@@ -3123,7 +3119,7 @@ void AdapterHandlerLibrary::create_native_wrapper(const methodHandle& method) {
+@@ -3124,7 +3120,7 @@ void AdapterHandlerLibrary::create_native_wrapper(const methodHandle& method) {
  VMReg SharedRuntime::name_for_receiver() {
    VMRegPair regs;
    BasicType sig_bt = T_OBJECT;
@@ -994,7 +994,7 @@ index 95369e6272e..ef2b688c7f1 100644
    // Return argument 0 register.  In the LP64 build pointers
    // take 2 registers, but the VM wants only the 'main' name.
    return regs.first();
-@@ -3154,7 +3150,7 @@ VMRegPair *SharedRuntime::find_callee_arguments(Symbol* sig, bool has_receiver,
+@@ -3155,7 +3151,7 @@ VMRegPair *SharedRuntime::find_callee_arguments(Symbol* sig, bool has_receiver,
    assert(cnt < 256, "grow table size");
 
    int comp_args_on_stack;

patches-17/README-zero.txt

@@ -30,7 +30,7 @@ any source 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/jdk16 \
+--enable-unlimited-crypto --with-boot-jdk=/usr/jdk/instances/jdk17 \
 --with-native-debug-symbols=none \
 --with-toolchain-type=gcc \
 --disable-dtrace \

patches-17/README.txt

@@ -3,6 +3,12 @@ considerably modified. Cut from the jdk15 patches as of jdk15+32.
 
 See also README-zero.txt for patches to build a project zero variant.
 
+17.0.17
+
+Minor patch noise.
+
+Don't use a fixed 32-bit path to dlopen libXrender
+
 17.0.16
 
 Minor patch noise.

patches-17/Solaris11-EM_486.patch

@@ -1,6 +1,6 @@
---- openjdk14/src/hotspot/os/solaris/os_solaris.cpp.orig	2021-08-30 09:47:00.387082887 +0000
-+++ openjdk14/src/hotspot/os/solaris/os_solaris.cpp	2021-08-30 09:48:20.965475955 +0000
-@@ -1438,7 +1438,7 @@
+--- src/hotspot/os/solaris/os_solaris.cpp
++++ src/hotspot/os/solaris/os_solaris.cpp
+@@ -1235,7 +1235,7 @@
 
    static const arch_t arch_array[]={
      {EM_386,         EM_386,     ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},