From 732e43544ca7102e96048214dee6412d2f95d3dc Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Fri, 1 Dec 2023 22:28:58 +0000
Subject: [PATCH] openjdk17: update to 17.0.9+9

---
 build/openjdk17/build.sh                      |   2 +-
 build/openjdk17/patches/README.txt            |  70 ++++
 build/openjdk17/patches/illumos-port-1.patch  |   6 +-
 build/openjdk17/patches/illumos-port-12.patch |  35 --
 build/openjdk17/patches/illumos-port-13.patch |   4 +-
 build/openjdk17/patches/illumos-port-14.patch |   2 +-
 build/openjdk17/patches/illumos-port-15.patch |  15 +
 build/openjdk17/patches/illumos-port-16.patch |  28 ++
 build/openjdk17/patches/illumos-port-17.patch |  63 ++++
 build/openjdk17/patches/illumos-port-6.patch  |   4 +-
 build/openjdk17/patches/illumos-port-7.patch  |   2 +-
 build/openjdk17/patches/illumos-port-8.patch  |   2 +-
 build/openjdk17/patches/illumos-port-9.patch  |   2 +-
 .../openjdk17/patches/illumos-signal-1.patch  |   2 +-
 .../openjdk17/patches/illumos-signal-2.patch  |   4 +-
 .../openjdk17/patches/illumos-signal-3.patch  |   2 +-
 .../patches/java-solaris-sparc.patch          | 334 ++++++------------
 .../patch-make_autoconf_flags-cflags.m4       |   2 +-
 build/openjdk17/patches/series                |   4 +-
 .../patches/tribblix-flags-cflags.patch       |   4 +-
 20 files changed, 305 insertions(+), 282 deletions(-)
 delete mode 100644 build/openjdk17/patches/illumos-port-12.patch
 create mode 100644 build/openjdk17/patches/illumos-port-15.patch
 create mode 100644 build/openjdk17/patches/illumos-port-16.patch
 create mode 100644 build/openjdk17/patches/illumos-port-17.patch

diff --git a/build/openjdk17/build.sh b/build/openjdk17/build.sh
index 7efb084e20..17f115c5b1 100755
--- a/build/openjdk17/build.sh
+++ b/build/openjdk17/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=openjdk
-VER=17.0.8.1+1
+VER=17.0.9+9
 PKG=runtime/java/openjdk17
 SUMMARY="openjdk ${VER%%.*}"
 DESC="Open-source implementation of the seventeenth edition of the "
diff --git a/build/openjdk17/patches/README.txt b/build/openjdk17/patches/README.txt
index 90584fd862..40c295b421 100644
--- a/build/openjdk17/patches/README.txt
+++ b/build/openjdk17/patches/README.txt
@@ -7,6 +7,76 @@ Most patches -p0
 
 JDK17:
 
+17.0.9
+
+Much rework around safefetch. Removed illumos-port-12.patch, and
+removed the is_safefetch_fault() block entirely. (Looked at the
+Windows port, and that block was removed there in this release. It
+wasn't present at all in other platforms.) Copied the new assembler
+src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_64.S to
+src/hotspot/os_cpu/solaris_x86/safefetch_solaris_x86_64.S, see
+illumos-port-17.patch
+
+In os_solaris_x86.cpp, the end of print_context() is now split off
+into print_tos_pc()
+
+We need an implementation of os::can_trim_native_heap() and
+trim_native_heap(); simply add a stub in os_solaris.inline.hpp to
+return false like pretty much every other platform except linux does.
+
+17.0.8
+
+Reinstate make/data/charsetmapping/stdcs-solaris, removal broke the
+build.
+See illumos-port-16.patch
+
+Cleanup: remove TAR_CREATE_FILE_PARAM TAR_CREATE_EXTRA_PARAM
+
+Cleanup: Removed another STLPORT reference
+
+17.0.7
+
+Minor patch noise. Removed an STLPORT patch.
+
+17.0.6
+
+Minor patch noise.
+
+17.0.5
+
+A number of functions centralised into os_posix
+
+17.0.4
+
+Build broken by https://www.illumos.org/issues/14418. That did 2
+things -  (1) exposed memcntl and meminfo by default, and (2) changed
+the signature for memcntl from caddr_t to void so there's a
+mismatch. The fix adopted is to modify the internal java signature for
+memcntl to the new version, which still allows builds on older
+releases as the old definition in sys/mman.h was effectively invisible
+there.
+
+
+Remove some unnecessary patches
+src/java.base/unix/native/libjli/java_md.h
+ - new comment is good
+src/java.desktop/unix/native/common/awt/fontpath.c
+ - shouldn't need to check for SunOS 5.8/5.9
+Remove HS_DTRACE_WORKAROUND_TAIL_CALL_BUG, the bug it works around
+  was fixed in 2008
+Remove remaining SUNPRO and related MLIB_NO_LIBSUNMATH checks
+src/java.desktop/unix/native/common/awt/X11Color.c
+ - the complexity is over 20 years old and no longer relevant
+make/autoconf/flags-cflags.m4
+ - adding -DTRIMMED is useless
+src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
+ - unnecessary on illumos and current Solaris (and my S10 system too)
+use the 64-bit rdtsc variant
+
+17.0.2
+
+illumos-port-15.patch to fix the broken ld check
+
 17-35
 
 RC1, no changes
diff --git a/build/openjdk17/patches/illumos-port-1.patch b/build/openjdk17/patches/illumos-port-1.patch
index e64a792517..e527d91102 100644
--- a/build/openjdk17/patches/illumos-port-1.patch
+++ b/build/openjdk17/patches/illumos-port-1.patch
@@ -1,6 +1,6 @@
 --- a/src/hotspot/os/solaris/os_solaris.cpp	Thu May 28 11:43:31 2020
 +++ b/src/hotspot/os/solaris/os_solaris.cpp	Thu May 28 13:53:16 2020
-@@ -2785,52 +2785,35 @@
+@@ -2751,52 +2751,35 @@
  bool os::Solaris::_synchronization_initialized;
  
  void os::Solaris::synchronization_init() {
@@ -78,7 +78,7 @@
    }
    _synchronization_initialized = true;
  }
-@@ -3634,9 +3616,6 @@
+@@ -3581,9 +3563,6 @@
  // 3.   Tx resumes from park
  
  
@@ -88,7 +88,7 @@
  // utility to compute the abstime argument to timedwait.
  // TODO-FIXME: switch from compute_abstime() to unpackTime().
  
-@@ -3650,24 +3629,8 @@
+@@ -3597,24 +3576,8 @@
    jlong seconds = millis / 1000;
    jlong max_wait_period;
  
diff --git a/build/openjdk17/patches/illumos-port-12.patch b/build/openjdk17/patches/illumos-port-12.patch
deleted file mode 100644
index 11693ea69e..0000000000
--- a/build/openjdk17/patches/illumos-port-12.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-JDK-8257828: SafeFetch may crash if invoked in non-JavaThreads
-
-diff --git a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
-index 3986d57e818..befe4df4755 100644
---- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
-+++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
-@@ -463,6 +463,15 @@ JVM_handle_solaris_signal(int sig, siginfo_t* info, void* ucVoid,
-     assert(sig == info->si_signo, "bad siginfo");
-   }
-
-+  // Handle SafeFetch faults:
-+  if (uc != NULL) {
-+    address const pc = (address) uc->uc_mcontext.gregs[REG_PC];
-+    if (pc && StubRoutines::is_safefetch_fault(pc)) {
-+      os::Posix::ucontext_set_pc(uc, StubRoutines::continuation_for_safefetch_fault(pc));
-+      return 1;
-+    }
-+  }
-+
-   // decide if this trap can be handled by a stub
-   address stub = NULL;
-
-@@ -473,11 +482,6 @@ JVM_handle_solaris_signal(int sig, siginfo_t* info, void* ucVoid,
-     // factor me: getPCfromContext
-     pc = (address) uc->uc_mcontext.gregs[REG_PC];
-
--    if (StubRoutines::is_safefetch_fault(pc)) {
--      os::Posix::ucontext_set_pc(uc, StubRoutines::continuation_for_safefetch_fault(pc));
--      return true;
--    }
--
-     // Handle ALL stack overflow variations here
-     if (sig == SIGSEGV && info->si_code == SEGV_ACCERR) {
-       address addr = (address) info->si_addr;
diff --git a/build/openjdk17/patches/illumos-port-13.patch b/build/openjdk17/patches/illumos-port-13.patch
index 9efd23972e..9f95e7a3a5 100644
--- a/build/openjdk17/patches/illumos-port-13.patch
+++ b/build/openjdk17/patches/illumos-port-13.patch
@@ -18,7 +18,7 @@ diff --git a/src/hotspot/os/solaris/os_solaris.cpp b/src/hotspot/os/solaris/os_s
 index 894958e7c..5273ea961 100644
 --- a/src/hotspot/os/solaris/os_solaris.cpp
 +++ b/src/hotspot/os/solaris/os_solaris.cpp
-@@ -1592,37 +1592,6 @@ void os::print_jni_name_suffix_on(outputStream* st, int args_size) {
+@@ -1584,37 +1584,6 @@ void os::print_jni_name_suffix_on(outputStream* st, int args_size) {
    // no suffix required
  }
  
@@ -56,7 +56,7 @@ index 894958e7c..5273ea961 100644
  ////////////////////////////////////////////////////////////////////////////////
  // Virtual Memory
  
-@@ -2909,7 +2909,6 @@ jint os::init_2(void) {
+@@ -2906,7 +2875,6 @@ jint os::init_2(void) {
      FLAG_SET_ERGO_IF_DEFAULT(UseNUMAInterleaving, true);
    }
  
diff --git a/build/openjdk17/patches/illumos-port-14.patch b/build/openjdk17/patches/illumos-port-14.patch
index ce91eb707e..0532fefea1 100644
--- a/build/openjdk17/patches/illumos-port-14.patch
+++ b/build/openjdk17/patches/illumos-port-14.patch
@@ -7,7 +7,7 @@ diff --git a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp b/src/hotspot/os_
 index c5a72c791..9d9ab5618 100644
 --- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
 +++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
-@@ -382,8 +382,11 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
+@@ -377,8 +377,11 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
      // Handle ALL stack overflow variations here
      if (sig == SIGSEGV && info->si_code == SEGV_ACCERR) {
        address addr = (address) info->si_addr;
diff --git a/build/openjdk17/patches/illumos-port-15.patch b/build/openjdk17/patches/illumos-port-15.patch
new file mode 100644
index 0000000000..5a08a69bc4
--- /dev/null
+++ b/build/openjdk17/patches/illumos-port-15.patch
@@ -0,0 +1,15 @@
+--- a/make/autoconf/toolchain.m4	Sat Jul  3 15:56:43 2021
++++ b/make/autoconf/toolchain.m4	Sat Jul  3 16:11:51 2021
+@@ -228,7 +228,11 @@
+   # Linux x86_64 needs higher binutils after 8265783
+   # (this really is a dependency on as version, but we take ld as a check for a general binutils version)
+   if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+-    TOOLCHAIN_MINIMUM_LD_VERSION_gcc="2.25"
++    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
++      TOOLCHAIN_MINIMUM_LD_VERSION_gcc=""
++    else
++      TOOLCHAIN_MINIMUM_LD_VERSION_gcc="2.25"
++    fi
+   fi
+ 
+   # Use indirect variable referencing
diff --git a/build/openjdk17/patches/illumos-port-16.patch b/build/openjdk17/patches/illumos-port-16.patch
new file mode 100644
index 0000000000..2cdf615d92
--- /dev/null
+++ b/build/openjdk17/patches/illumos-port-16.patch
@@ -0,0 +1,28 @@
+--- /dev/null	Sat Mar  4 12:15:07 2023
++++ a/make/data/charsetmapping/stdcs-solaris	Sat Mar  4 12:03:56 2023
+@@ -0,0 +1,25 @@
++#
++#   generate these charsets into sun.nio.cs
++#
++Big5
++Big5_Solaris
++Big5_HKSCS        # always together with Big5
++EUC_CN
++EUC_KR
++EUC_JP
++EUC_JP_LINUX
++EUC_JP_Open
++EUC_TW
++GBK
++ISO_8859_11
++ISO_8859_3
++ISO_8859_6
++ISO_8859_8
++Johab
++PCK
++TIS_620
++JIS_X_0201
++JIS_X_0208
++JIS_X_0212
++JIS_X_0208_Solaris
++JIS_X_0212_Solaris
diff --git a/build/openjdk17/patches/illumos-port-17.patch b/build/openjdk17/patches/illumos-port-17.patch
new file mode 100644
index 0000000000..bdf05fd2d7
--- /dev/null
+++ b/build/openjdk17/patches/illumos-port-17.patch
@@ -0,0 +1,63 @@
+Copied verbatim from the linux_x86 version
+
+--- /dev/null	Thu Oct 19 11:20:19 2023
++++ b/src/hotspot/os_cpu/solaris_x86/safefetch_solaris_x86_64.S	Thu Oct 19 11:02:38 2023
+@@ -0,0 +1,58 @@
++#
++# Copyright (c) 2022 SAP SE. All rights reserved.
++# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++    .globl SafeFetch32_impl
++    .globl SafeFetchN_impl
++    .globl _SafeFetch32_fault
++    .globl _SafeFetchN_fault
++    .globl _SafeFetch32_continuation
++    .globl _SafeFetchN_continuation
++
++	.text
++
++
++    # Support for int SafeFetch32(int* address, int defaultval);
++    #
++    #  %rdi : address
++    #  %esi : defaultval
++    .type    SafeFetch32_impl,@function
++SafeFetch32_impl:
++_SafeFetch32_fault:
++    movl (%rdi), %eax       # load target value, may fault
++    ret
++_SafeFetch32_continuation:
++    movl %esi, %eax         # return default
++    ret
++
++    # Support for intptr_t SafeFetchN(intptr_t* address, intptr_t defaultval);
++    #
++    #  %rdi : address
++    #  %rsi : defaultval
++    .type    SafeFetchN_impl,@function
++SafeFetchN_impl:
++_SafeFetchN_fault:
++    movq (%rdi), %rax       # load target value, may fault
++    ret
++_SafeFetchN_continuation:
++    movq %rsi, %rax         # return default
++    ret
diff --git a/build/openjdk17/patches/illumos-port-6.patch b/build/openjdk17/patches/illumos-port-6.patch
index 1337c06988..1e8bbb3ef4 100644
--- a/build/openjdk17/patches/illumos-port-6.patch
+++ b/build/openjdk17/patches/illumos-port-6.patch
@@ -6,7 +6,7 @@ It "fixes" AIX because that's using the xlc toolchain.
 
 --- a/src/hotspot/share/runtime/os.cpp	Wed Aug 12 16:38:30 2020
 +++ b/src/hotspot/share/runtime/os.cpp	Thu Aug 13 19:44:36 2020
-@@ -155,7 +155,7 @@
+@@ -148,7 +148,7 @@
    // No offset when dealing with UTC
    time_t UTC_to_local = 0;
    if (!utc) {
@@ -15,7 +15,7 @@ It "fixes" AIX because that's using the xlc toolchain.
      UTC_to_local = -(time_struct.tm_gmtoff);
  #elif defined(_WINDOWS)
      long zone;
-@@ -166,7 +166,7 @@
+@@ -159,7 +159,7 @@
  #endif
  
      // tm_gmtoff already includes adjustment for daylight saving
diff --git a/build/openjdk17/patches/illumos-port-7.patch b/build/openjdk17/patches/illumos-port-7.patch
index fa3b31b6ff..e5e2b1010b 100644
--- a/build/openjdk17/patches/illumos-port-7.patch
+++ b/build/openjdk17/patches/illumos-port-7.patch
@@ -1,6 +1,6 @@
 --- a/src/hotspot/share/prims/methodHandles.cpp	Wed Aug 19 21:41:08 2020
 +++ b/src/hotspot/share/prims/methodHandles.cpp	Fri Aug 21 10:42:08 2020
-@@ -1528,6 +1528,10 @@
+@@ -1532,6 +1532,10 @@
  #define LANG "Ljava/lang/"
  #define JLINV "Ljava/lang/invoke/"
  
diff --git a/build/openjdk17/patches/illumos-port-8.patch b/build/openjdk17/patches/illumos-port-8.patch
index dd853ce4c8..18952dc360 100644
--- a/build/openjdk17/patches/illumos-port-8.patch
+++ b/build/openjdk17/patches/illumos-port-8.patch
@@ -1,6 +1,6 @@
 --- a/src/hotspot/os/posix/os_posix.cpp	Fri Oct 16 12:10:19 2020
 +++ b/src/hotspot/os/posix/os_posix.cpp	Fri Oct 16 12:11:19 2020
-@@ -1102,7 +1102,7 @@
+@@ -1190,7 +1190,7 @@
                        "enabled executable stack (see man page execstack(8))");
  
    } else {
diff --git a/build/openjdk17/patches/illumos-port-9.patch b/build/openjdk17/patches/illumos-port-9.patch
index 5579115c62..ae2aa3374f 100644
--- a/build/openjdk17/patches/illumos-port-9.patch
+++ b/build/openjdk17/patches/illumos-port-9.patch
@@ -49,7 +49,7 @@
  }
  
  frame os::get_sender_for_C_frame(frame* fr) {
-@@ -464,39 +434,8 @@
+@@ -459,39 +429,8 @@
      // Handle ALL stack overflow variations here
      if (sig == SIGSEGV && info->si_code == SEGV_ACCERR) {
        address addr = (address) info->si_addr;
diff --git a/build/openjdk17/patches/illumos-signal-1.patch b/build/openjdk17/patches/illumos-signal-1.patch
index 7c02237dac..170291deac 100644
--- a/build/openjdk17/patches/illumos-signal-1.patch
+++ b/build/openjdk17/patches/illumos-signal-1.patch
@@ -1,6 +1,6 @@
 --- a/src/hotspot/os/posix/signals_posix.cpp	Wed Oct  7 17:21:51 2020
 +++ b/src/hotspot/os/posix/signals_posix.cpp	Sat Oct 10 16:46:21 2020
-@@ -552,6 +552,8 @@
+@@ -546,6 +546,8 @@
  #define JVM_HANDLE_XXX_SIGNAL JVM_handle_aix_signal
  #elif defined(LINUX)
  #define JVM_HANDLE_XXX_SIGNAL JVM_handle_linux_signal
diff --git a/build/openjdk17/patches/illumos-signal-2.patch b/build/openjdk17/patches/illumos-signal-2.patch
index 5ca0b807dd..be45d8da41 100644
--- a/build/openjdk17/patches/illumos-signal-2.patch
+++ b/build/openjdk17/patches/illumos-signal-2.patch
@@ -1,6 +1,6 @@
 --- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp	Sat Oct 10 19:55:00 2020
 +++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp	Sat Oct 10 20:28:45 2020
-@@ -687,7 +687,12 @@
+@@ -682,7 +682,12 @@
      return false;
    }
  
@@ -14,7 +14,7 @@
      struct sigaction oldAct;
      sigaction(sig, (struct sigaction *)0, &oldAct);
      if (oldAct.sa_sigaction != signalHandler) {
-@@ -696,6 +701,7 @@
+@@ -691,6 +696,7 @@
        warning("Unexpected Signal %d occurred under user-defined signal handler %#lx", sig, (long)sighand);
      }
    }
diff --git a/build/openjdk17/patches/illumos-signal-3.patch b/build/openjdk17/patches/illumos-signal-3.patch
index 799db2b2d9..729d4abf7d 100644
--- a/build/openjdk17/patches/illumos-signal-3.patch
+++ b/build/openjdk17/patches/illumos-signal-3.patch
@@ -64,7 +64,7 @@
    if (info == NULL || info->si_code <= 0 || info->si_code == SI_NOINFO) {
      // can't decode this kind of signal
      info = NULL;
-@@ -616,52 +564,6 @@
+@@ -611,52 +559,6 @@
      return true;
    }
  
diff --git a/build/openjdk17/patches/java-solaris-sparc.patch b/build/openjdk17/patches/java-solaris-sparc.patch
index 9bfaab9e74..3b954f458c 100644
--- a/build/openjdk17/patches/java-solaris-sparc.patch
+++ b/build/openjdk17/patches/java-solaris-sparc.patch
@@ -24,35 +24,6 @@
  src/hotspot/os_cpu/windows_x86 : hotspot/src/os_cpu/windows_x86/vm
  src/hotspot : hotspot/src
  src/utils/IdealGraphVisualizer : hotspot/src/share/tools/IdealGraphVisualizer
---- old/make/Bundles.gmk	2020-05-20 17:58:19.940152562 -0700
-+++ new/make/Bundles.gmk	2020-05-20 17:58:19.604146110 -0700
-@@ -101,7 +101,7 @@
-           # If no subdir is specified and only one BASE_DIR, tar.gz can be done
-           # directly from BASE_DIR.
- 	  $(CD) $$($1_BASE_DIRS) \
--	      && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
-+	      && ( $(TAR) cf - \
- 	          -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
- 	          $(TAR_IGNORE_EXIT_VALUE) ) \
- 	      | $(GZIP) > $$@
-@@ -110,7 +110,7 @@
-           # If only one BASE_DIR, but with a SUBDIR set, tar.gz can use the
-           # transform option to create bundle directly from the BASE_DIR.
- 	  $(CD) $$($1_BASE_DIRS) \
--	      && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
-+	      && ( $(TAR) cf - \
- 	          -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
- 	          $$(if $$($1_SUBDIR), --transform 's|^|$$($1_SUBDIR)/|S') \
- 	          $(TAR_IGNORE_EXIT_VALUE) ) \
-@@ -140,7 +140,7 @@
-           endif
-           ifeq ($$($1_TYPE), tar.gz)
- 	    $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \
--	    ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
-+	    ( $(TAR) cf - \
- 	        $$(if $$($1_SUBDIR), $$($1_SUBDIR), .) $(TAR_IGNORE_EXIT_VALUE) ) \
- 	    | $(GZIP) > $$@
-           else ifeq ($$($1_TYPE), zip)
 --- old/make/RunTestsPrebuilt.gmk	2020-05-20 17:58:24.212234589 -0700
 +++ new/make/RunTestsPrebuilt.gmk	2020-05-20 17:58:23.828227215 -0700
 @@ -163,8 +163,6 @@
@@ -134,7 +105,7 @@
  endif
 --- old/make/autoconf/basic_tools.m4	2020-05-20 17:58:27.308294035 -0700
 +++ new/make/autoconf/basic_tools.m4	2020-05-20 17:58:26.972287584 -0700
-@@ -270,25 +270,17 @@
+@@ -280,8 +280,6 @@
      TAR_TYPE="bsd"
    elif test "x$($TAR -v | $GREP "bsdtar")" != "x"; then
      TAR_TYPE="bsd"
@@ -143,34 +114,9 @@
    elif test "x$($TAR --version | $GREP "busybox")" != "x"; then
      TAR_TYPE="busybox"
    elif test "x$OPENJDK_BUILD_OS" = "xaix"; then
-     TAR_TYPE="aix"
-   fi
-   AC_MSG_CHECKING([what type of tar was found])
-   AC_MSG_RESULT([$TAR_TYPE])
- 
--  TAR_CREATE_FILE_PARAM=""
--
-   if test "x$TAR_TYPE" = "xgnu"; then
-     TAR_INCLUDE_PARAM="T"
-     TAR_SUPPORTS_TRANSFORM="true"
--    if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
--      # When using gnu tar for Solaris targets, need to use compatibility mode
--      TAR_CREATE_EXTRA_PARAM="--format=ustar"
--    fi
-   elif test "x$TAR_TYPE" = "aix"; then
-     # -L InputList of aix tar: name of file listing the files and directories
-     # that need to be archived or extracted
-@@ -302,7 +294,6 @@
-     TAR_SUPPORTS_TRANSFORM="false"
-   fi
-   AC_SUBST(TAR_TYPE)
--  AC_SUBST(TAR_CREATE_EXTRA_PARAM)
-   AC_SUBST(TAR_INCLUDE_PARAM)
-   AC_SUBST(TAR_SUPPORTS_TRANSFORM)
- ])
-@@ -425,8 +416,6 @@
-       fi
-     fi
+@@ -391,8 +389,6 @@
+     UTIL_REQUIRE_PROGS(XATTR, xattr)
+     UTIL_LOOKUP_PROGS(CODESIGN, codesign)
      UTIL_REQUIRE_PROGS(SETFILE, SetFile)
 -  elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
 -    UTIL_REQUIRE_PROGS(ELFEDIT, elfedit)
@@ -179,7 +125,7 @@
      UTIL_REQUIRE_PROGS(ULIMIT, ulimit)
 --- old/make/autoconf/build-aux/config.guess	2020-05-20 17:58:28.372314465 -0700
 +++ new/make/autoconf/build-aux/config.guess	2020-05-20 17:58:27.980306938 -0700
-@@ -42,14 +42,6 @@
+@@ -75,14 +75,6 @@
    fi
  fi
  
@@ -218,7 +164,7 @@
    elif test -x /usr/sbin/sysctl; then
 --- old/make/autoconf/flags-cflags.m4	2020-05-20 17:58:30.492355171 -0700
 +++ new/make/autoconf/flags-cflags.m4	2020-05-20 17:58:30.108347798 -0700
-@@ -409,9 +409,6 @@
+@@ -413,9 +413,6 @@
    if test "x$OPENJDK_TARGET_OS" = xlinux; then
      CFLAGS_OS_DEF_JVM="-DLINUX"
      CFLAGS_OS_DEF_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
@@ -293,7 +239,7 @@
              fi
 --- old/make/autoconf/libraries.m4	2020-05-20 17:58:41.188560546 -0700
 +++ new/make/autoconf/libraries.m4	2020-05-20 17:58:40.768552482 -0700
-@@ -121,15 +114,13 @@
+@@ -114,15 +114,13 @@
    BASIC_JVM_LIBS="$LIBM"
  
    # Dynamic loading library
@@ -310,7 +256,7 @@
    fi
  
    # librt for legacy clock_gettime
-@@ -160,12 +151,6 @@
+@@ -159,12 +157,6 @@
      BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat"
    fi
  
@@ -322,8 +268,8 @@
 -
    if test "x$OPENJDK_TARGET_OS" = xwindows; then
      BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
-         comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
-@@ -183,7 +168,6 @@
+         comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
+@@ -182,7 +174,6 @@
    AC_SUBST(JVM_LIBS)
    AC_SUBST(OPENJDK_BUILD_JDKLIB_LIBS)
    AC_SUBST(OPENJDK_BUILD_JVM_LIBS)
@@ -333,7 +279,7 @@
  ################################################################################
 --- old/make/autoconf/platform.m4	2020-05-20 17:58:42.328582435 -0700
 +++ new/make/autoconf/platform.m4	2020-05-20 17:58:41.904574294 -0700
-@@ -184,10 +196,6 @@
+@@ -196,10 +196,6 @@
        VAR_OS=linux
        VAR_OS_TYPE=unix
        ;;
@@ -344,7 +290,7 @@
      *darwin*)
        VAR_OS=macosx
        VAR_OS_TYPE=unix
-@@ -458,17 +466,6 @@
+@@ -470,17 +466,6 @@
    fi
    AC_SUBST(OPENJDK_$1_CPU_LEGACY_LIB)
  
@@ -362,7 +308,7 @@
    # Setup OPENJDK_$1_CPU_OSARCH, which is used to set the os.arch Java system property
    OPENJDK_$1_CPU_OSARCH="$OPENJDK_$1_CPU"
    if test "x$OPENJDK_$1_OS" = xlinux && test "x$OPENJDK_$1_CPU" = xx86; then
-@@ -598,9 +593,6 @@
+@@ -608,9 +593,6 @@
  
  AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
  [
@@ -372,7 +318,7 @@
    if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
      RELEASE_FILE_OS_NAME=Linux
    fi
-@@ -656,25 +648,9 @@
+@@ -667,25 +649,9 @@
    PLATFORM_SET_MODULE_TARGET_OS_VALUES
    PLATFORM_SET_RELEASE_FILE_OS_VALUES
    PLATFORM_SETUP_LEGACY_VARS
@@ -410,7 +356,7 @@
  OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
  OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
  OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
-@@ -538,7 +537,6 @@
+@@ -539,7 +538,6 @@
  # LDFLAGS used to link the jdk native libraries (C-code)
  LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
  JDKLIB_LIBS:=@JDKLIB_LIBS@
@@ -418,7 +364,7 @@
  
  # LDFLAGS used to link the jdk native launchers (C-code)
  LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
-@@ -752,7 +750,6 @@
+@@ -753,7 +751,6 @@
  LDD:=@LDD@
  OTOOL:=@OTOOL@
  READELF:=@READELF@
@@ -426,22 +372,6 @@
  EXPR:=@EXPR@
  FILE:=@FILE@
  DOT:=@DOT@
-@@ -770,7 +767,6 @@
- ULIMIT:=@ULIMIT@
- 
- TAR_TYPE:=@TAR_TYPE@
--TAR_CREATE_EXTRA_PARAM:=@TAR_CREATE_EXTRA_PARAM@
- TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@
- TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
- 
-@@ -785,7 +781,6 @@
- VCRUNTIME_1_DLL:=@VCRUNTIME_1_DLL@
- MSVCP_DLL:=@MSVCP_DLL@
- UCRT_DLL_DIR:=@UCRT_DLL_DIR@
--STLPORT_LIB:=@STLPORT_LIB@
- ENABLE_PANDOC:=@ENABLE_PANDOC@
- PANDOC_MARKDOWN_FLAG:=@PANDOC_MARKDOWN_FLAG@
- 
 --- old/make/autoconf/toolchain.m4	2020-05-20 17:58:44.612626291 -0700
 +++ new/make/autoconf/toolchain.m4	2020-05-20 17:58:44.216618687 -0700
 @@ -39,7 +39,6 @@
@@ -491,7 +421,7 @@
    # set. Some files get their write permissions removed after being copied to the
 --- old/make/common/NativeCompilation.gmk	2020-05-20 17:58:47.780687120 -0700
 +++ new/make/common/NativeCompilation.gmk	2020-05-20 17:58:47.440680591 -0700
-@@ -990,7 +990,7 @@
+@@ -1000,7 +1000,7 @@
            $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).pdb \
                $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).map
  
@@ -500,7 +430,7 @@
            $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).debuginfo
            # Setup the command line creating debuginfo files, to be run after linking.
            # It cannot be run separately since it updates the original target file
-@@ -1124,7 +1124,7 @@
+@@ -1134,7 +1134,7 @@
      endif
  
      $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
@@ -509,7 +439,7 @@
          $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \
          $$($1_STRIP_CMD)
      $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-@@ -1183,7 +1183,7 @@
+@@ -1193,7 +1193,7 @@
  
  		  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
  		      $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
@@ -518,7 +448,7 @@
  		          $$($1_LIBS) $$($1_EXTRA_LIBS)) \
  		      | $(GREP) -v "^   Creating library .*\.lib and object .*\.exp" || \
  		          test "$$$$?" = "1" ; \
-@@ -1196,7 +1196,7 @@
+@@ -1206,7 +1206,7 @@
  		  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
  		      $$(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
  		      $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
@@ -529,7 +459,7 @@
  		  $$($1_STRIP_CMD)
 --- old/make/common/modules/LauncherCommon.gmk	2020-05-20 17:58:50.820745492 -0700
 +++ new/make/common/modules/LauncherCommon.gmk	2020-05-20 17:58:50.488739117 -0700
-@@ -151,7 +151,6 @@
+@@ -150,7 +150,6 @@
            -DLAUNCHER_NAME='"$$(LAUNCHER_NAME)"' \
            -DPROGNAME='"$1"' \
            $$($1_CFLAGS), \
@@ -537,7 +467,7 @@
        CFLAGS_windows := $$($1_CFLAGS_windows), \
        DISABLED_WARNINGS_gcc := unused-function, \
        LDFLAGS := $$(LDFLAGS_JDKEXE) \
-@@ -161,14 +160,11 @@
+@@ -160,14 +159,11 @@
            -L$(call FindLibDirForModule, java.base), \
        LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN,/../lib) \
            -L$(call FindLibDirForModule, java.base), \
@@ -719,23 +649,6 @@
  else ifeq ($(call isTargetOs, macosx), true)
    # nm on macosx prints out "warning: nm: no name list" to stderr for
    # files without symbols. Hide this, even at the expense of hiding real errors.
---- old/make/hotspot/test/GtestImage.gmk	2020-05-20 17:59:02.544970605 -0700
-+++ new/make/hotspot/test/GtestImage.gmk	2020-05-20 17:59:02.160963232 -0700
-@@ -56,14 +56,4 @@
-   )
- endif
- 
--ifeq ($(call isTargetOs, solaris), true)
--  $(foreach v, $(JVM_VARIANTS), \
--    $(eval $(call SetupCopyFiles, COPY_GTEST_STLPORT_$v, \
--        DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
--        FILES := $(STLPORT_LIB), \
--    )) \
--    $(eval TARGETS += $$(COPY_GTEST_STLPORT_$v)) \
--  )
--endif
--
- all: $(TARGETS)
 --- old/make/ide/visualstudio/hotspot/CreateVSProject.gmk	2020-05-20 17:59:05.797033047 -0700
 +++ new/make/ide/visualstudio/hotspot/CreateVSProject.gmk	2020-05-20 17:59:05.409025597 -0700
 @@ -76,7 +76,6 @@
@@ -851,7 +764,7 @@
  # If FDLIBM_CFLAGS is non-empty we know that we can optimize
  # fdlibm when adding those extra C flags. Currently GCC,
  # and clang only.
-@@ -62,7 +58,7 @@
+@@ -63,7 +59,7 @@
  ##########################################################################################
  
  LIBVERIFY_OPTIMIZATION := HIGH
@@ -860,7 +773,7 @@
    ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
      LIBVERIFY_OPTIMIZATION := LOW
    endif
-@@ -106,7 +101,6 @@
+@@ -106,7 +102,6 @@
      LIBS := $(BUILD_LIBFDLIBM_TARGET), \
      LIBS_unix := -ljvm, \
      LIBS_linux := $(LIBDL), \
@@ -868,7 +781,7 @@
      LIBS_aix := $(LIBDL) $(LIBM),\
      LIBS_macosx := -framework CoreFoundation \
          -framework Foundation \
-@@ -214,7 +209,6 @@
+@@ -215,7 +210,6 @@
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS_unix := $(LIBZ_LIBS), \
      LIBS_linux := $(LIBDL) -lpthread, \
@@ -909,7 +822,7 @@
    endif
 --- old/make/modules/java.desktop/lib/Awt2dLibraries.gmk	2020-05-20 17:59:15.341216302 -0700
 +++ new/make/modules/java.desktop/lib/Awt2dLibraries.gmk	2020-05-20 17:59:14.945208698 -0700
-@@ -76,7 +76,7 @@
+@@ -77,7 +77,7 @@
        #
  endif
  
@@ -918,7 +831,7 @@
    LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
  endif
  
-@@ -156,7 +156,6 @@
+@@ -157,7 +157,6 @@
          -delayload:comctl32.dll -delayload:shlwapi.dll, \
      LIBS_unix := -ljvm -ljava $(LIBM), \
      LIBS_linux :=  $(LIBDL), \
@@ -934,7 +847,7 @@
    ))
  
    $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
-@@ -447,7 +445,7 @@
+@@ -449,7 +447,7 @@
                          -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H \
                          -DHB_NO_PRAGMA_GCC_DIAGNOSTIC
     endif
@@ -943,7 +856,7 @@
       HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
     endif
  
-@@ -608,10 +606,7 @@
+@@ -615,10 +613,7 @@
    ifeq ($(call isTargetOs, macosx), true)
      JAWT_LIBS := -lawt_lwawt
    else
@@ -955,7 +868,7 @@
      ifeq ($(ENABLE_HEADLESS_ONLY), false)
        JAWT_LIBS += -lawt_xawt
      else
-@@ -638,7 +633,6 @@
+@@ -645,7 +640,6 @@
        LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
        LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
        LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \
@@ -1092,7 +1005,7 @@
      TARGETS += $(BUILD_LIBSCTP)
 --- old/make/scripts/compare.sh	2020-05-20 17:59:27.985459081 -0700
 +++ new/make/scripts/compare.sh	2020-05-20 17:59:27.597451631 -0700
-@@ -72,14 +72,7 @@
+@@ -73,14 +73,7 @@
  # Disassembly diff filters. These filters try to filter out ephemeral parts of the
  # disassembly, such as hard-coded addresses, to be able to catch "actual" differences.
  
@@ -1108,7 +1021,7 @@
    if [ "$OPENJDK_TARGET_CPU" = "x86" ]; then
      DIS_DIFF_FILTER="$SED -r \
          -e 's/^  [0-9A-F]{16}: //' \
-@@ -458,14 +439,7 @@
+@@ -447,14 +440,7 @@
      fi
  
      CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
@@ -1124,7 +1037,7 @@
  
      ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE)
      ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE)
-@@ -485,14 +459,8 @@
+@@ -474,14 +460,8 @@
      fi
  
      if [ "$CMP_ZIPS_CONTENTS" = "true" ]; then
@@ -1141,7 +1054,7 @@
  
          # Separate executable/library files from other files in zip.
          DIFFING_TEXT_FILES=
-@@ -829,10 +797,6 @@
+@@ -826,10 +806,6 @@
          # to filter out that extra information.
          $DUMPBIN -exports $OTHER_FILE | $GREP  -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
          $DUMPBIN -exports $THIS_FILE  | $GREP  -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
@@ -1221,7 +1134,7 @@
 -
  ifeq ($(call isTargetOs, windows), true)
      BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
-     BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c
+     BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c libnativeStack.c
 --- old/make/test/JtregNativeJdk.gmk	2020-05-20 17:59:34.437582966 -0700
 +++ new/make/test/JtregNativeJdk.gmk	2020-05-20 17:59:34.045575440 -0700
 @@ -73,9 +73,6 @@
@@ -1273,7 +1186,7 @@
  #endif /* !_JAVASOFT_JVM_MD_H_ */
 --- old/src/hotspot/os/posix/os_posix.cpp	2020-05-20 17:59:42.965746713 -0700
 +++ new/src/hotspot/os/posix/os_posix.cpp	2020-05-20 17:59:42.629740261 -0700
-@@ -489,7 +489,7 @@
+@@ -490,7 +490,7 @@
    st->print("%d", sysconf(_SC_CHILD_MAX));
  
    print_rlimit(st, ", THREADS", RLIMIT_THREADS);
@@ -1282,7 +1195,7 @@
    print_rlimit(st, ", NPROC", RLIMIT_NPROC);
  #endif
  
-@@ -507,12 +507,6 @@
+@@ -508,12 +508,6 @@
    print_rlimit(st, ", MEMLOCK", RLIMIT_MEMLOCK, true);
  #endif
  
@@ -1295,7 +1208,7 @@
    // MacOS; The maximum size (in bytes) to which a process's resident set size may grow.
  #if defined(__APPLE__)
    print_rlimit(st, ", RSS", RLIMIT_RSS, true);
-@@ -960,7 +954,7 @@
+@@ -988,7 +982,7 @@
  // page size which again depends on the concrete system the VM is running
  // on. Space for libc guard pages is not included in this size.
  jint os::Posix::set_minimum_stack_sizes() {
@@ -1304,7 +1217,7 @@
  
    _java_thread_min_stack_allowed = _java_thread_min_stack_allowed +
                                     StackOverflow::stack_guard_zone_size() +
-@@ -1281,8 +1275,7 @@
+@@ -1309,8 +1303,7 @@
    if ((status = pthread_mutexattr_settype(_mutexAttr, PTHREAD_MUTEX_NORMAL)) != 0) {
      fatal("pthread_mutexattr_settype: %s", os::strerror(status));
    }
@@ -1314,7 +1227,7 @@
  }
  
  static int (*_pthread_condattr_setclock)(pthread_condattr_t *, clockid_t) = NULL;
-@@ -1497,7 +1490,6 @@
+@@ -1525,7 +1518,6 @@
  // Shared pthread_mutex/cond based PlatformEvent implementation.
  // Not currently usable by Solaris.
  
@@ -1322,7 +1235,7 @@
  
  // PlatformEvent
  //
-@@ -1927,8 +1919,6 @@
+@@ -1955,8 +1947,6 @@
      return OS_OK;
    }
  }
@@ -1333,7 +1246,7 @@
  #ifdef __APPLE__
 --- old/src/hotspot/os/posix/os_posix.hpp	2020-05-20 17:59:44.033767220 -0700
 +++ new/src/hotspot/os/posix/os_posix.hpp	2020-05-20 17:59:43.649759847 -0700
-@@ -123,8 +123,6 @@
+@@ -125,8 +125,6 @@
    sigjmp_buf _jmpbuf;
  };
  
@@ -1342,7 +1255,7 @@
  /*
   * This is the platform-specific implementation underpinning
   * the ParkEvent class, which itself underpins Java-level monitor
-@@ -290,6 +288,4 @@
+@@ -292,6 +290,4 @@
    void notify_all();
  };
  
@@ -1380,7 +1293,7 @@
  #endif
 --- old/src/hotspot/share/c1/c1_LIR.cpp	2020-05-20 17:59:59.318060690 -0700
 +++ new/src/hotspot/share/c1/c1_LIR.cpp	2020-05-20 17:59:58.926053163 -0700
-@@ -452,8 +452,6 @@
+@@ -467,8 +467,6 @@
      case lir_monaddr:        // input and result always valid, info always invalid
      case lir_null_check:     // input and info always valid, result always invalid
      case lir_move:           // input and result always valid, may have info
@@ -1389,7 +1302,7 @@
      {
        assert(op->as_Op1() != NULL, "must be");
        LIR_Op1* op1 = (LIR_Op1*)op;
-@@ -1664,8 +1662,6 @@
+@@ -1763,8 +1761,6 @@
       case lir_convert:               s = "convert";       break;
       case lir_alloc_object:          s = "alloc_obj";     break;
       case lir_monaddr:               s = "mon_addr";      break;
@@ -1400,16 +1313,16 @@
       case lir_cmp_l2i:               s = "cmp_l2i";       break;
 --- old/src/hotspot/share/c1/c1_LIR.hpp	2020-05-20 18:00:00.446082348 -0700
 +++ new/src/hotspot/share/c1/c1_LIR.hpp	2020-05-20 18:00:00.042074591 -0700
-@@ -921,8 +921,6 @@
+@@ -927,8 +927,6 @@
        , lir_monaddr
        , lir_roundfp
        , lir_safepoint
 -      , lir_pack64
 -      , lir_unpack64
        , lir_unwind
+       , lir_load_klass
    , end_op1
-   , begin_op2
-@@ -2114,9 +2112,6 @@
+@@ -2254,9 +2252,6 @@
    void logical_or  (LIR_Opr left, LIR_Opr right, LIR_Opr dst) { append(new LIR_Op2(lir_logic_or,   left, right, dst)); }
    void logical_xor (LIR_Opr left, LIR_Opr right, LIR_Opr dst) { append(new LIR_Op2(lir_logic_xor,  left, right, dst)); }
  
@@ -1442,7 +1355,7 @@
  
 --- old/src/hotspot/share/runtime/globals.hpp	2020-05-20 18:00:31.194672744 -0700
 +++ new/src/hotspot/share/runtime/globals.hpp	2020-05-20 18:00:30.854666216 -0700
-@@ -689,10 +689,6 @@
+@@ -690,10 +690,6 @@
    product_pd(bool, DontYieldALot,                                           \
            "Throw away obvious excess yield calls")                          \
                                                                              \
@@ -1453,7 +1366,7 @@
    product(bool, DisablePrimordialThreadGuardPages, false, EXPERIMENTAL,     \
                 "Disable the use of stack guard pages if the JVM is loaded " \
                 "on the primordial process thread")                          \
-@@ -734,10 +730,6 @@
+@@ -743,10 +739,6 @@
            "When true prevents OS-level spurious, or premature, wakeups "    \
            "from Object.wait (Ignored for Windows)")                         \
                                                                              \
@@ -1464,7 +1377,7 @@
    product(bool, ReduceSignalUsage, false,                                   \
            "Reduce the use of OS signals in Java and/or the VM")             \
                                                                              \
-@@ -1664,10 +1656,8 @@
+@@ -1670,10 +1662,8 @@
    product(intx, ThreadPriorityPolicy, 0,                                    \
            "0 : Normal.                                                     "\
            "    VM chooses priorities that are appropriate for normal       "\
@@ -1477,7 +1390,7 @@
            "    priorities. However, with ThreadPriorityPolicy=0, VM will   "\
            "    not use the highest possible native priority,               "\
            "    THREAD_PRIORITY_TIME_CRITICAL, as it may interfere with     "\
-@@ -2017,8 +2006,7 @@
+@@ -2022,8 +2012,7 @@
             "do not map the archive")                                        \
             range(0, 2)                                                      \
                                                                              \
@@ -1504,7 +1417,7 @@
    if (PrintFlagsFinal || PrintFlagsRanges) {
 --- old/src/hotspot/share/runtime/os.hpp	2020-05-20 18:00:34.390734111 -0700
 +++ new/src/hotspot/share/runtime/os.hpp	2020-05-20 18:00:34.014726891 -0700
-@@ -484,7 +484,7 @@
+@@ -493,7 +493,7 @@
  
    static void free_thread(OSThread* osthread);
  
@@ -1513,7 +1426,7 @@
    static intx current_thread_id();
    static int current_process_id();
  
-@@ -838,10 +838,8 @@
+@@ -842,10 +842,8 @@
    // JVMTI & JVM monitoring and management support
    // The thread_cpu_time() and current_thread_cpu_time() are only
    // supported if is_thread_cpu_time_supported() returns true.
@@ -1537,7 +1450,7 @@
  # include "semaphore_bsd.hpp"
 --- old/src/hotspot/share/runtime/thread.cpp	2020-05-20 18:00:37.538794556 -0700
 +++ new/src/hotspot/share/runtime/thread.cpp	2020-05-20 18:00:37.202788104 -0700
-@@ -347,12 +347,6 @@
+@@ -348,12 +348,6 @@
    set_stack_base(os::current_stack_base());
    set_stack_size(os::current_stack_size());
  
@@ -1567,7 +1480,7 @@
  
 --- old/src/hotspot/share/services/memTracker.hpp	2020-05-20 18:00:39.774837489 -0700
 +++ new/src/hotspot/share/services/memTracker.hpp	2020-05-20 18:00:39.374829809 -0700
-@@ -86,11 +86,9 @@
+@@ -87,11 +87,9 @@
  #include "services/threadStackTracker.hpp"
  #include "services/virtualMemoryTracker.hpp"
  
@@ -1583,7 +1496,7 @@
  class MemBaseline;
 --- old/src/hotspot/share/utilities/debug.cpp	2020-05-20 18:00:41.782876045 -0700
 +++ new/src/hotspot/share/utilities/debug.cpp	2020-05-20 18:00:41.442869517 -0700
-@@ -639,12 +639,11 @@
+@@ -637,12 +637,11 @@
    tty->print_cr("  findm(intptr_t pc) - finds Method*");
    tty->print_cr("  find(intptr_t x)   - finds & prints nmethod/stub/bytecode/oop based on pointer into it");
    tty->print_cr("  pns(void* sp, void* fp, void* pc)  - print native (i.e. mixed) stack trace. E.g.");
@@ -1755,16 +1668,7 @@
  #include <netinet/in.h>
 --- old/src/hotspot/share/utilities/vmError.cpp	2020-05-20 18:00:48.214999546 -0700
 +++ new/src/hotspot/share/utilities/vmError.cpp	2020-05-20 18:00:47.822992019 -0700
-@@ -94,7 +94,7 @@
-   "JAVA_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
-   "PATH", "USERNAME",
- 
--  // Env variables that are defined on Solaris/Linux/BSD
-+  // Env variables that are defined on Linux/BSD
-   "LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY",
-   "HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE",
-   "LANG", "LC_ALL", "LC_CTYPE", "LC_NUMERIC", "LC_TIME",
-@@ -1611,8 +1611,6 @@
+@@ -1790,8 +1790,6 @@
        out.print_raw   ("#   Executing ");
  #if defined(LINUX) || defined(_ALLBSD_SOURCE)
        out.print_raw   ("/bin/sh -c ");
@@ -1773,7 +1677,7 @@
  #elif defined(_WINDOWS)
        out.print_raw   ("cmd /C ");
  #endif
-@@ -1674,8 +1672,6 @@
+@@ -1853,8 +1851,6 @@
      tty->print("#   Executing ");
  #if defined(LINUX)
      tty->print  ("/bin/sh -c ");
@@ -1828,7 +1732,7 @@
     identifiers matching a C constant. The PREFIX_ is filtered out in the
 --- old/src/java.base/share/conf/security/java.security	2020-05-20 18:00:54.519120590 -0700
 +++ new/src/java.base/share/conf/security/java.security	2020-05-20 18:00:54.183114138 -0700
-@@ -60,9 +60,6 @@
+@@ -63,9 +63,6 @@
  #
  # List of providers and their preference orders (see above):
  #
@@ -1838,7 +1742,7 @@
  security.provider.tbd=SUN
  security.provider.tbd=SunRsaSign
  security.provider.tbd=SunEC
-@@ -83,9 +77,7 @@
+@@ -83,9 +80,7 @@
  #ifdef macosx
  security.provider.tbd=Apple
  #endif
@@ -2589,7 +2493,7 @@
  #elif defined(_AIX)
  
  static char *
-@@ -824,15 +505,6 @@
+@@ -823,15 +504,6 @@
              free((void *) freetz);
          }
  #else
@@ -2787,7 +2691,7 @@
    sigused = sigismember(&jvmsigs, sig);
    if (jvm_signal_installed && sigused) {
      /* jvm has installed its signal handler for this signal. */
-@@ -340,7 +289,6 @@
+@@ -351,7 +300,6 @@
  }
  
  JNIEXPORT struct sigaction *JVM_get_signal_action(int sig) {
@@ -4024,7 +3928,7 @@
  #else
 --- old/src/java.base/unix/native/libnio/ch/Net.c	2020-05-20 18:01:34.943896775 -0700
 +++ new/src/java.base/unix/native/libnio/ch/Net.c	2020-05-20 18:01:34.515888557 -0700
-@@ -170,7 +170,7 @@
+@@ -215,7 +215,7 @@
  JNIEXPORT jboolean JNICALL
  Java_sun_nio_ch_Net_canIPv6SocketJoinIPv4Group0(JNIEnv* env, jclass cl)
  {
@@ -4033,7 +3937,7 @@
      /* IPv6 sockets can join IPv4 multicast groups */
      return JNI_TRUE;
  #else
-@@ -182,7 +182,7 @@
+@@ -227,7 +227,7 @@
  JNIEXPORT jboolean JNICALL
  Java_sun_nio_ch_Net_canJoin6WithIPv4Group0(JNIEnv* env, jclass cl)
  {
@@ -4096,7 +4000,7 @@
   * Since winsock doesn't have the equivalent of strerror(errno)
 --- old/src/java.desktop/share/classes/sun/awt/FontConfiguration.java	2020-05-20 18:01:41.588024347 -0700
 +++ new/src/java.desktop/share/classes/sun/awt/FontConfiguration.java	2020-05-20 18:01:41.204016974 -0700
-@@ -1431,22 +1431,6 @@
+@@ -1440,22 +1440,6 @@
                  }
              }
          }
@@ -4229,8 +4133,8 @@
                   " use natives = " + useNatives +
 --- old/src/java.desktop/share/classes/sun/font/FontUtilities.java	2020-05-20 18:01:48.020147849 -0700
 +++ new/src/java.desktop/share/classes/sun/font/FontUtilities.java	2020-05-20 18:01:47.620140168 -0700
-@@ -41,8 +41,6 @@
- @SuppressWarnings("removal")
+@@ -40,8 +40,6 @@
+  */
  public final class FontUtilities {
  
 -    public static boolean isSolaris;
@@ -4238,7 +4142,7 @@
      public static boolean isLinux;
  
      public static boolean isMacOSX;
-@@ -64,7 +62,6 @@
+@@ -67,7 +65,6 @@
              @Override
              public Object run() {
                  String osName = System.getProperty("os.name", "unknownOS");
@@ -4734,7 +4638,7 @@
      static boolean isLinux() {
          return (osname.equals("Linux"));
      }
-@@ -302,7 +298,7 @@
+@@ -303,7 +299,7 @@
                  }
              }
          } else {
@@ -4743,7 +4647,7 @@
                  printers = getAllPrinterNamesSysV();
              } else if (isAIX()) {
                  printers = getAllPrinterNamesAIX();
-@@ -486,7 +482,7 @@
+@@ -487,7 +483,7 @@
          }
          /* fallback if nothing not having a printer at this point */
          PrintService printer = null;
@@ -4752,7 +4656,7 @@
              printer = getNamedPrinterNameSysV(name);
          } else if (isAIX()) {
              printer = getNamedPrinterNameAIX(name);
-@@ -654,7 +650,7 @@
+@@ -658,7 +654,7 @@
                  psuri = printerInfo[1];
              }
          } else {
@@ -4761,7 +4665,7 @@
                  defaultPrinter = getDefaultPrinterNameSysV();
              } else if (isAIX()) {
                  defaultPrinter = getDefaultPrinterNameAIX();
-@@ -873,7 +869,7 @@
+@@ -878,7 +874,7 @@
          ArrayList<String> results = null;
          try {
              final String[] cmd = new String[3];
@@ -4772,7 +4676,7 @@
                  cmd[2] = "env LC_ALL=C " + command;
 --- old/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java	2020-05-20 18:02:39.605138318 -0700
 +++ new/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java	2020-05-20 18:02:39.221130945 -0700
-@@ -881,51 +881,25 @@
+@@ -882,51 +882,25 @@
                          isAttributeCategorySupported(JobSheets.class)) {
              ncomps+=1;
          }
@@ -4845,7 +4749,7 @@
          if (IPPPrintService.debugPrint) {
 --- old/src/java.desktop/unix/classes/sun/print/UnixPrintService.java	2020-05-20 18:02:40.629157980 -0700
 +++ new/src/java.desktop/unix/classes/sun/print/UnixPrintService.java	2020-05-20 18:02:40.293151529 -0700
-@@ -223,31 +223,6 @@
+@@ -220,31 +220,6 @@
          return name;
      }
  
@@ -4877,7 +4781,7 @@
      private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsBSD() {
          if (PrintServiceLookupProvider.cmdIndex ==
              PrintServiceLookupProvider.UNINITIALIZED) {
-@@ -325,9 +300,7 @@
+@@ -322,9 +297,7 @@
      }
  
      private PrinterIsAcceptingJobs getPrinterIsAcceptingJobs() {
@@ -4888,7 +4792,7 @@
              return getPrinterIsAcceptingJobsBSD();
          } else if (PrintServiceLookupProvider.isAIX()) {
              return getPrinterIsAcceptingJobsAIX();
-@@ -354,14 +327,6 @@
+@@ -351,14 +324,6 @@
          }
      }
  
@@ -4903,7 +4807,7 @@
      private QueuedJobCount getQueuedJobCountBSD() {
          if (PrintServiceLookupProvider.cmdIndex ==
              PrintServiceLookupProvider.UNINITIALIZED) {
-@@ -418,9 +383,7 @@
+@@ -415,9 +380,7 @@
      }
  
      private QueuedJobCount getQueuedJobCount() {
@@ -4914,7 +4818,7 @@
              return getQueuedJobCountBSD();
          } else if (PrintServiceLookupProvider.isAIX()) {
              return getQueuedJobCountAIX();
-@@ -429,13 +392,6 @@
+@@ -426,13 +389,6 @@
          }
      }
  
@@ -4928,7 +4832,7 @@
      private PrintServiceAttributeSet getBSDServiceAttributes() {
          PrintServiceAttributeSet attrs = new HashPrintServiceAttributeSet();
          attrs.add(getQueuedJobCountBSD());
-@@ -473,9 +429,7 @@
+@@ -471,9 +427,7 @@
      }
  
      private PrintServiceAttributeSet getDynamicAttributes() {
@@ -5143,7 +5047,7 @@
                                      "libgssapi_krb5.so",
 --- old/src/java.security.jgss/share/classes/sun/security/krb5/Config.java	2020-05-20 18:02:50.089339623 -0700
 +++ new/src/java.security.jgss/share/classes/sun/security/krb5/Config.java	2020-05-20 18:02:49.705332249 -0700
-@@ -927,8 +927,6 @@
+@@ -933,8 +933,6 @@
              if (name == null) {
                  name = "c:\\winnt\\krb5.ini";
              }
@@ -5244,7 +5148,7 @@
  }
 --- old/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java	2020-05-20 18:02:59.697524107 -0700
 +++ new/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java	2020-05-20 18:02:59.357517578 -0700
-@@ -696,15 +696,10 @@
+@@ -700,15 +700,10 @@
          lib = expand(lib);
          int i = lib.indexOf("/$ISA/");
          if (i != -1) {
@@ -5264,7 +5168,7 @@
  
 --- old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java	2020-05-20 18:03:09.173706056 -0700
 +++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java	2020-05-20 18:03:08.789698683 -0700
-@@ -40,7 +40,6 @@
+@@ -41,7 +41,6 @@
  import sun.jvm.hotspot.debugger.NoSuchSymbolException;
  import sun.jvm.hotspot.debugger.bsd.BsdDebuggerLocal;
  import sun.jvm.hotspot.debugger.linux.LinuxDebuggerLocal;
@@ -5272,7 +5176,7 @@
  import sun.jvm.hotspot.debugger.remote.RemoteDebugger;
  import sun.jvm.hotspot.debugger.remote.RemoteDebuggerClient;
  import sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer;
-@@ -364,9 +361,7 @@
+@@ -363,9 +362,7 @@
                  } catch (UnsupportedPlatformException e) {
                     throw new DebuggerException(e);
                  }
@@ -5283,7 +5187,7 @@
                      setupDebuggerWin32();
                  } else if (os.equals("linux")) {
                      setupDebuggerLinux();
-@@ -418,11 +413,7 @@
+@@ -417,11 +414,7 @@
          // configure the VM.
  
          try {
@@ -5296,7 +5200,7 @@
                  db = new HotSpotTypeDataBase(machDesc,
                  new Win32VtblAccess(debugger, jvmLibNames),
                  debugger, jvmLibNames);
-@@ -507,29 +498,6 @@
+@@ -506,29 +499,6 @@
          System.err.println("Loaded alternate HotSpot SA Debugger: " + alternateName);
      }
  
@@ -5326,7 +5230,7 @@
      private void connectRemoteDebugger() throws DebuggerException {
          RemoteDebugger remote =
          (RemoteDebugger) RMIHelper.lookup(debugServerID);
-@@ -545,9 +509,7 @@
+@@ -540,9 +510,7 @@
      }
  
      private void setupJVMLibNames(String os) {
@@ -5337,7 +5241,7 @@
              setupJVMLibNamesWin32();
          } else if (os.equals("linux")) {
              setupJVMLibNamesLinux();
-@@ -570,10 +522,6 @@
+@@ -555,10 +523,6 @@
          }
      }
  
@@ -5359,7 +5263,7 @@
  import sun.jvm.hotspot.runtime.win32_x86.Win32X86JavaThreadPDAccess;
  import sun.jvm.hotspot.runtime.win32_amd64.Win32AMD64JavaThreadPDAccess;
  import sun.jvm.hotspot.runtime.win32_aarch64.Win32AARCH64JavaThreadPDAccess;
-@@ -100,13 +96,7 @@
+@@ -99,13 +97,7 @@
  
          access = null;
          // FIXME: find the platform specific PD class by reflection?
@@ -5716,7 +5620,7 @@
  extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
 --- old/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c	2020-05-20 18:03:40.558308663 -0700
 +++ new/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c	2020-05-20 18:03:40.174301290 -0700
-@@ -334,10 +334,11 @@
+@@ -331,10 +331,11 @@
              break;
          case SCTP_ADDR_MADE_PRIM :
              event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_MADE_PRIM;
@@ -5731,7 +5635,7 @@
  
 --- old/src/jdk.sctp/unix/native/libsctp/SctpNet.c	2020-05-20 18:03:41.630329248 -0700
 +++ new/src/jdk.sctp/unix/native/libsctp/SctpNet.c	2020-05-20 18:03:41.242321797 -0700
-@@ -364,11 +364,7 @@
+@@ -371,11 +371,7 @@
      int i, addrCount;
      jobjectArray isaa;
  
@@ -5740,10 +5644,10 @@
 -#else /* __linux__ */
      if ((addrCount = nio_sctp_getladdrs(fd, 0, (struct sockaddr **)&addr_buf)) == -1) {
 -#endif
-         handleSocketError(env, errno);
+         sctpHandleSocketError(env, errno);
          return NULL;
      }
-@@ -413,11 +409,7 @@
+@@ -420,11 +416,7 @@
      int i, addrCount;
      jobjectArray isaa;
  
@@ -5752,7 +5656,7 @@
 -#else /* __linux__ */
      if ((addrCount = nio_sctp_getpaddrs(fd, id, (struct sockaddr **)&addr_buf)) == -1) {
 -#endif
-         handleSocketError(env, errno);
+         sctpHandleSocketError(env, errno);
          return NULL;
      }
 --- old/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java	2020-05-20 18:03:42.730350368 -0700
@@ -13873,7 +13777,7 @@
 -#endif // OS_SOLARIS_OS_SOLARIS_HPP
 --- old/src/hotspot/os/solaris/os_solaris.inline.hpp	2020-05-20 18:09:36.197137133 -0700
 +++ /dev/null	2020-03-09 18:57:19.455001459 -0700
-@@ -1,63 +0,0 @@
+@@ -1,67 +0,0 @@
 -/*
 - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -13930,6 +13834,10 @@
 -inline void os::map_stack_shadow_pages(address sp) {
 -}
 -
+-// Trim-native support, stubbed out for now, may be enabled later
+-inline bool os::can_trim_native_heap() { return false; }
+-inline bool os::trim_native_heap(os::size_change_t* rss_change) { return false; }
+-
 -//////////////////////////////////////////////////////////////////////////////
 -////////////////////////////////////////////////////////////////////////////////
 -
@@ -15079,11 +14987,6 @@
 -    // factor me: getPCfromContext
 -    pc = (address) uc->uc_mcontext.gregs[REG_PC];
 -
--    if (StubRoutines::is_safefetch_fault(pc)) {
--      os::Posix::ucontext_set_pc(uc, StubRoutines::continuation_for_safefetch_fault(pc));
--      return true;
--    }
--
 -    // Handle ALL stack overflow variations here
 -    if (sig == SIGSEGV && info->si_code == SEGV_ACCERR) {
 -      address addr = (address) info->si_addr;
@@ -15387,10 +15290,15 @@
 -#endif // AMD64
 -  st->cr();
 -  st->cr();
+-}
+-
+-void os::print_tos_pc(outputStream *st, const void *context) {
+-  if (context == NULL) return;
 -
--  intptr_t *sp = (intptr_t *)os::Solaris::ucontext_get_sp(uc);
--  st->print_cr("Top of Stack: (sp=" INTPTR_FORMAT ")", (intptr_t)sp);
--  print_hex_dump(st, (address)sp, (address)(sp + 8*sizeof(intptr_t)), sizeof(intptr_t));
+-  const ucontext_t* uc = (const ucontext_t*)context;
+-
+-  address sp = (address)os::Solaris::ucontext_get_sp(uc);
+-  print_tos(st, sp);
 -  st->cr();
 -
 -  // Note: it may be unsafe to inspect memory near pc. For example, pc may
@@ -28718,31 +28626,3 @@
 -{
 -    return -1;
 -}
---- old/make/data/charsetmapping/stdcs-solaris	Wed Jul 19 17:51:02 2023
-+++ /dev/null	Wed Jul 19 17:36:26 2023
-@@ -1,25 +0,0 @@
--#
--#   generate these charsets into sun.nio.cs
--#
--Big5
--Big5_Solaris
--Big5_HKSCS        # always together with Big5
--EUC_CN
--EUC_KR
--EUC_JP
--EUC_JP_LINUX
--EUC_JP_Open
--EUC_TW
--GBK
--ISO_8859_11
--ISO_8859_3
--ISO_8859_6
--ISO_8859_8
--Johab
--PCK
--TIS_620
--JIS_X_0201
--JIS_X_0208
--JIS_X_0212
--JIS_X_0208_Solaris
--JIS_X_0212_Solaris
diff --git a/build/openjdk17/patches/patch-make_autoconf_flags-cflags.m4 b/build/openjdk17/patches/patch-make_autoconf_flags-cflags.m4
index 24e486f5f0..53d0bf9505 100644
--- a/build/openjdk17/patches/patch-make_autoconf_flags-cflags.m4
+++ b/build/openjdk17/patches/patch-make_autoconf_flags-cflags.m4
@@ -18,7 +18,7 @@ Support for SunOS/gcc.
  
    elif test "x$TOOLCHAIN_TYPE" = xclang; then
      if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-@@ -436,6 +441,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
+@@ -471,6 +476,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
  
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
      ALWAYS_DEFINES_JVM="-D_GNU_SOURCE -D_REENTRANT"
diff --git a/build/openjdk17/patches/series b/build/openjdk17/patches/series
index 7c7826112f..c6d836b829 100644
--- a/build/openjdk17/patches/series
+++ b/build/openjdk17/patches/series
@@ -11,9 +11,11 @@ illumos-port-8.patch
 illumos-port-9.patch
 illumos-port-10.patch
 illumos-port-11.patch
-illumos-port-12.patch
 illumos-port-13.patch
 illumos-port-14.patch
+illumos-port-15.patch
+illumos-port-16.patch
+illumos-port-17.patch
 illumos-signal-1.patch
 illumos-signal-2.patch
 illumos-signal-3.patch
diff --git a/build/openjdk17/patches/tribblix-flags-cflags.patch b/build/openjdk17/patches/tribblix-flags-cflags.patch
index d9d8c3bfd1..e2b821cd61 100644
--- a/build/openjdk17/patches/tribblix-flags-cflags.patch
+++ b/build/openjdk17/patches/tribblix-flags-cflags.patch
@@ -1,6 +1,6 @@
 --- make/autoconf/flags-cflags.m4~	Sun Apr 12 19:51:35 2020
 +++ make/autoconf/flags-cflags.m4	Sun Apr 12 21:38:33 2020
-@@ -464,8 +464,8 @@
+@@ -501,8 +501,8 @@
    fi
  
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -11,7 +11,7 @@
      # reduce lib size on linux in link step, this needs also special compile flags
      # do this on s390x also for libjvm (where serviceability agent is not supported)
      if test "x$ENABLE_LINKTIME_GC" = xtrue; then
-@@ -519,7 +519,12 @@
+@@ -556,7 +556,12 @@
    # C99 level.
    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xxlc; then
      # Explicitly set C99. clang and xlclang support the same flag.