~olbohlen/oi-userland.git

parent: 9a6458b6 | patch | commit | ignore whitespace

Andreas Wacknitz

2024-01-27 7fe9353e9c385beadc7196f539242540105d1c6f

openjdk-21: update to 21.0.2

9 files modified

	components/runtime/openjdk-21/Makefile	15 ●●●●● patch \| view \| raw \| blame \| history
	components/runtime/openjdk-21/manifests/sample-manifest.p5m	2 ●●●●● patch \| view \| raw \| blame \| history
	components/runtime/openjdk-21/patches/1_java-solaris-sparc.patch	1341 ●●●●● patch \| view \| raw \| blame \| history
	components/runtime/openjdk-21/patches/README-zero.txt	4 ●●●●● patch \| view \| raw \| blame \| history
	components/runtime/openjdk-21/patches/README.txt	12 ●●●●● patch \| view \| raw \| blame \| history
	components/runtime/openjdk-21/patches/illumos-port-02.patch	4 ●●●●● patch \| view \| raw \| blame \| history
	components/runtime/openjdk-21/patches/illumos-port-23.patch	6 ●●●●● patch \| view \| raw \| blame \| history
	components/runtime/openjdk-21/patches/illumos-zero-2.patch	2 ●●●●● patch \| view \| raw \| blame \| history
	components/runtime/openjdk-21/pkg5	6 ●●●●● patch \| view \| raw \| blame \| history

 components/runtime/openjdk-21/Makefile

@@ -13,23 +13,24 @@
# Copyright 2016 Alexander Pyhalov
# Copyright 2019 Michal Nowak
# Copyright 2021 Andreas Grueninger, Grueninger GmbH, (grueni). All rights reserved.
# Copyright 2023 Niklas Poslovski
# Copyright 2023-2024 Niklas Poslovski
#

include ../../../make-rules/shared-macros.mk

OPENJDK_VERSION=    21
OPENJDK_PATCH=    35
OPENJDK_UPDATE=    0
OPENJDK_BUILD=    2
COMPONENT_NAME=        openjdk
COMPONENT_VERSION=    $(OPENJDK_VERSION)
COMPONENT_VERSION=    $(OPENJDK_VERSION).$(OPENJDK_UPDATE).$(OPENJDK_BUILD)
COMPONENT_FMRI=    runtime/java/$(COMPONENT_NAME)$(OPENJDK_VERSION)
COMPONENT_SUMMARY=    Open-source implementation of the Java Platform, Standard Edition
COMPONENT_SRC=    jdk-jdk-$(OPENJDK_VERSION)-$(OPENJDK_PATCH)
COMPONENT_ARCHIVE=    jdk-$(OPENJDK_VERSION)+$(OPENJDK_PATCH).tar.gz
COMPONENT_SRC=  jdk$(OPENJDK_VERSION)u-jdk-$(OPENJDK_VERSION).$(OPENJDK_UPDATE).$(OPENJDK_BUILD)-ga
COMPONENT_ARCHIVE=      jdk-$(OPENJDK_VERSION).$(OPENJDK_UPDATE).$(OPENJDK_BUILD)-ga.tar.gz
COMPONENT_ARCHIVE_HASH= \
    sha256:0a0a978c8f55176d2a807d0c88e31810aaf13c8889ac4ba19af4f4a4c188d3e4
    sha256:17eda717843ffbbacc7de4bdcd934f404a23a57ebb3cda3cec630a668651531f
COMPONENT_ARCHIVE_URL= \
    https://github.com/openjdk/jdk/archive/$(COMPONENT_ARCHIVE)
    https://github.com/openjdk/jdk$(OPENJDK_VERSION)u/archive/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=    https://openjdk.java.net/
COMPONENT_CLASSIFICATION=    Development/Java
COMPONENT_LICENSE=    GPLv2 with Classpath Exception

 components/runtime/openjdk-21/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

 components/runtime/openjdk-21/patches/1_java-solaris-sparc.patch

@@ -1,6 +1,6 @@
diff -Nru jdk-jdk-21-35.orig/bin/unshuffle_list.txt jdk-jdk-21-35/bin/unshuffle_list.txt
--- jdk-jdk-21-35.orig/bin/unshuffle_list.txt    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/bin/unshuffle_list.txt    2023-08-19 19:01:20.503075082 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/bin/unshuffle_list.txt jdk21u-jdk-21.0.2-ga/bin/unshuffle_list.txt
--- jdk21u-jdk-21.0.2-ga.orig/bin/unshuffle_list.txt    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/bin/unshuffle_list.txt    2024-01-27 14:37:30.220616758 +0100
@@ -100,6 +100,7 @@
 src/langtools/sample : langtools/src/sample
 src/linux : jdk/src/linux
@@ -25,9 +25,9 @@
 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
diff -Nru jdk-jdk-21-35.orig/make/autoconf/basic_tools.m4 jdk-jdk-21-35/make/autoconf/basic_tools.m4
--- jdk-jdk-21-35.orig/make/autoconf/basic_tools.m4    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/basic_tools.m4    2023-08-19 19:01:20.504795925 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/basic_tools.m4 jdk21u-jdk-21.0.2-ga/make/autoconf/basic_tools.m4
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/basic_tools.m4    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/basic_tools.m4    2024-01-27 14:37:30.222138510 +0100
@@ -289,6 +289,8 @@
     TAR_TYPE="bsd"
   elif test "x$($TAR --version | $GREP "busybox")" != "x"; then
@@ -37,9 +37,9 @@
   elif test "x$OPENJDK_BUILD_OS" = "xaix"; then
     TAR_TYPE="aix"
   fi
diff -Nru jdk-jdk-21-35.orig/make/autoconf/build-aux/config.guess jdk-jdk-21-35/make/autoconf/build-aux/config.guess
--- jdk-jdk-21-35.orig/make/autoconf/build-aux/config.guess    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/build-aux/config.guess    2023-08-19 19:01:20.505224135 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/build-aux/config.guess jdk21u-jdk-21.0.2-ga/make/autoconf/build-aux/config.guess
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/build-aux/config.guess    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/build-aux/config.guess    2024-01-27 14:37:30.222508121 +0100
@@ -53,6 +53,14 @@
   fi
 fi
@@ -55,9 +55,9 @@
 # Test and fix cygwin on x86_64
 echo $OUT | grep 86-pc-cygwin > /dev/null 2> /dev/null
 if test $? != 0; then
diff -Nru jdk-jdk-21-35.orig/make/autoconf/build-performance.m4 jdk-jdk-21-35/make/autoconf/build-performance.m4
--- jdk-jdk-21-35.orig/make/autoconf/build-performance.m4    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/build-performance.m4    2023-08-19 19:01:20.505752320 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/build-performance.m4 jdk21u-jdk-21.0.2-ga/make/autoconf/build-performance.m4
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/build-performance.m4    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/build-performance.m4    2024-01-27 14:37:30.222923689 +0100
@@ -33,6 +33,9 @@
     if test "$NUM_CORES" -eq "0"; then
       NUM_CORES=`cat /proc/cpuinfo  | grep -c ^CPU`
@@ -77,9 +77,9 @@
     MEMORY_SIZE=`/usr/sbin/prtconf 2> /dev/null | grep "^Memory [[Ss]]ize" | awk '{ print [$]3 }'`
     FOUND_MEM=yes
   elif test -x /usr/sbin/sysctl; then
diff -Nru jdk-jdk-21-35.orig/make/autoconf/flags-cflags.m4 jdk-jdk-21-35/make/autoconf/flags-cflags.m4
--- jdk-jdk-21-35.orig/make/autoconf/flags-cflags.m4    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/flags-cflags.m4    2023-08-19 19:01:20.506413111 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/flags-cflags.m4 jdk21u-jdk-21.0.2-ga/make/autoconf/flags-cflags.m4
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/flags-cflags.m4    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/flags-cflags.m4    2024-01-27 14:37:30.223496092 +0100
@@ -427,6 +427,9 @@
   if test "x$OPENJDK_TARGET_OS" = xlinux; then
     CFLAGS_OS_DEF_JVM="-DLINUX"
@@ -90,9 +90,9 @@
   elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
     CFLAGS_OS_DEF_JVM="-D_ALLBSD_SOURCE -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
diff -Nru jdk-jdk-21-35.orig/make/autoconf/jdk-options.m4 jdk-jdk-21-35/make/autoconf/jdk-options.m4
--- jdk-jdk-21-35.orig/make/autoconf/jdk-options.m4    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/jdk-options.m4    2023-08-19 19:01:20.507015425 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/jdk-options.m4 jdk21u-jdk-21.0.2-ga/make/autoconf/jdk-options.m4
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/jdk-options.m4    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/jdk-options.m4    2024-01-27 14:37:30.224003107 +0100
@@ -274,7 +274,7 @@
     ZIP_EXTERNAL_DEBUG_SYMBOLS=false
   elif test "x$with_native_debug_symbols" = xexternal; then
@@ -111,9 +111,9 @@
       if test "x$OBJCOPY" = x; then
         # enabling of enable-debug-symbols and can't find objcopy
         # this is an error
diff -Nru jdk-jdk-21-35.orig/make/autoconf/lib-freetype.m4 jdk-jdk-21-35/make/autoconf/lib-freetype.m4
--- jdk-jdk-21-35.orig/make/autoconf/lib-freetype.m4    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/lib-freetype.m4    2023-08-19 19:01:20.507506387 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/lib-freetype.m4 jdk21u-jdk-21.0.2-ga/make/autoconf/lib-freetype.m4
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/lib-freetype.m4    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/lib-freetype.m4    2024-01-27 14:37:30.224422276 +0100
@@ -53,6 +53,13 @@
     if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
       AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location.])
@@ -144,10 +144,10 @@
               AC_MSG_CHECKING([for freetype])
               AC_MSG_RESULT([yes (using pkg-config)])
             fi
diff -Nru jdk-jdk-21-35.orig/make/autoconf/libraries.m4 jdk-jdk-21-35/make/autoconf/libraries.m4
--- jdk-jdk-21-35.orig/make/autoconf/libraries.m4    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/libraries.m4    2023-08-19 19:01:20.507995799 +0200
@@ -145,13 +145,15 @@
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/libraries.m4 jdk21u-jdk-21.0.2-ga/make/autoconf/libraries.m4
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/libraries.m4    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/libraries.m4    2024-01-27 14:37:30.224823216 +0100
@@ -139,13 +139,15 @@
   BASIC_JVM_LIBS="$LIBM"
 
   # Dynamic loading library
@@ -164,7 +164,7 @@
   fi
 
   # librt for legacy clock_gettime
@@ -168,6 +170,12 @@
@@ -162,6 +164,12 @@
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat"
   fi
 
@@ -177,9 +177,9 @@
   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 powrprof.lib uuid.lib \
diff -Nru jdk-jdk-21-35.orig/make/autoconf/platform.m4 jdk-jdk-21-35/make/autoconf/platform.m4
--- jdk-jdk-21-35.orig/make/autoconf/platform.m4    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/platform.m4    2023-08-19 19:01:20.508620559 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/platform.m4 jdk21u-jdk-21.0.2-ga/make/autoconf/platform.m4
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/platform.m4    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/platform.m4    2024-01-27 14:37:30.225338337 +0100
@@ -202,6 +202,10 @@
       VAR_OS=linux
       VAR_OS_TYPE=unix
@@ -209,7 +209,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
@@ -601,6 +616,9 @@
@@ -603,6 +618,9 @@
 
 AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
 [
@@ -219,9 +219,9 @@
   if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
     RELEASE_FILE_OS_NAME=Linux
   fi
diff -Nru jdk-jdk-21-35.orig/make/autoconf/spec.gmk.in jdk-jdk-21-35/make/autoconf/spec.gmk.in
--- jdk-jdk-21-35.orig/make/autoconf/spec.gmk.in    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/spec.gmk.in    2023-08-19 19:01:20.509152641 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/spec.gmk.in jdk21u-jdk-21.0.2-ga/make/autoconf/spec.gmk.in
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/spec.gmk.in    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/spec.gmk.in    2024-01-27 14:37:30.225806432 +0100
@@ -93,6 +93,7 @@
 COMPILE_TYPE:=@COMPILE_TYPE@
 
@@ -230,9 +230,9 @@
 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@
diff -Nru jdk-jdk-21-35.orig/make/autoconf/toolchain.m4 jdk-jdk-21-35/make/autoconf/toolchain.m4
--- jdk-jdk-21-35.orig/make/autoconf/toolchain.m4    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/autoconf/toolchain.m4    2023-08-19 19:01:20.509682352 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/autoconf/toolchain.m4 jdk21u-jdk-21.0.2-ga/make/autoconf/toolchain.m4
--- jdk21u-jdk-21.0.2-ga.orig/make/autoconf/toolchain.m4    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/autoconf/toolchain.m4    2024-01-27 14:37:30.226309467 +0100
@@ -39,6 +39,7 @@
 
 # These toolchains are valid on different platforms
@@ -241,9 +241,9 @@
 VALID_TOOLCHAINS_macosx="clang"
 VALID_TOOLCHAINS_aix="xlc clang"
 VALID_TOOLCHAINS_windows="microsoft"
diff -Nru jdk-jdk-21-35.orig/make/common/MakeBase.gmk jdk-jdk-21-35/make/common/MakeBase.gmk
--- jdk-jdk-21-35.orig/make/common/MakeBase.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/common/MakeBase.gmk    2023-08-19 19:01:20.510232237 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/common/MakeBase.gmk jdk21u-jdk-21.0.2-ga/make/common/MakeBase.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/common/MakeBase.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/common/MakeBase.gmk    2024-01-27 14:37:30.226823111 +0100
@@ -263,7 +263,33 @@
 ################################################################################
 # All install-file and related macros automatically call DecodeSpace when needed.
@@ -279,9 +279,9 @@
   # On mac, extended attributes sometimes creep into the source files, which may later
   # cause the creation of ._* files which confuses testing. Clear these with xattr if
   # set. Some files get their write permissions removed after being copied to the
diff -Nru jdk-jdk-21-35.orig/make/common/modules/LauncherCommon.gmk jdk-jdk-21-35/make/common/modules/LauncherCommon.gmk
--- jdk-jdk-21-35.orig/make/common/modules/LauncherCommon.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/common/modules/LauncherCommon.gmk    2023-08-19 19:01:20.511439821 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/common/modules/LauncherCommon.gmk jdk21u-jdk-21.0.2-ga/make/common/modules/LauncherCommon.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/common/modules/LauncherCommon.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/common/modules/LauncherCommon.gmk    2024-01-27 14:37:30.227915467 +0100
@@ -163,6 +163,7 @@
           -DLAUNCHER_NAME='"$$(LAUNCHER_NAME)"' \
           -DPROGNAME='"$1"' \
@@ -305,21 +305,21 @@
       LIBS_aix := -ljli_static, \
       LIBS_windows := $$($1_WINDOWS_JLI_LIB) \
           $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib, \
diff -Nru jdk-jdk-21-35.orig/make/common/NativeCompilation.gmk jdk-jdk-21-35/make/common/NativeCompilation.gmk
--- jdk-jdk-21-35.orig/make/common/NativeCompilation.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/common/NativeCompilation.gmk    2023-08-19 19:01:20.510942997 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/common/NativeCompilation.gmk jdk21u-jdk-21.0.2-ga/make/common/NativeCompilation.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/common/NativeCompilation.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/common/NativeCompilation.gmk    2024-01-27 14:37:30.227475865 +0100
@@ -1058,7 +1058,7 @@
           $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).pdb \
               $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).map
           $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_BASENAME).pdb \
               $$($1_SYMBOLS_DIR)/$$($1_BASENAME).map
 
-        else ifeq ($(call isTargetOs, linux), true)
+        else ifeq ($(call isTargetOs, linux solaris), true)
           $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
diff -Nru jdk-jdk-21-35.orig/make/hotspot/gensrc/GensrcAdlc.gmk jdk-jdk-21-35/make/hotspot/gensrc/GensrcAdlc.gmk
--- jdk-jdk-21-35.orig/make/hotspot/gensrc/GensrcAdlc.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/hotspot/gensrc/GensrcAdlc.gmk    2023-08-19 19:01:20.511948193 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/gensrc/GensrcAdlc.gmk jdk21u-jdk-21.0.2-ga/make/hotspot/gensrc/GensrcAdlc.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/gensrc/GensrcAdlc.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/gensrc/GensrcAdlc.gmk    2024-01-27 14:37:30.228332662 +0100
@@ -36,6 +36,9 @@
   # NOTE: No optimization or debug flags set here
   ifeq ($(call isBuildOs, linux), true)
@@ -339,9 +339,9 @@
   else ifeq ($(call isTargetOs, aix), true)
     ADLCFLAGS += -DAIX=1
   else ifeq ($(call isTargetOs, macosx), true)
diff -Nru jdk-jdk-21-35.orig/make/hotspot/gensrc/GensrcDtrace.gmk jdk-jdk-21-35/make/hotspot/gensrc/GensrcDtrace.gmk
--- jdk-jdk-21-35.orig/make/hotspot/gensrc/GensrcDtrace.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/hotspot/gensrc/GensrcDtrace.gmk    2023-08-19 19:01:20.512434462 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/gensrc/GensrcDtrace.gmk jdk21u-jdk-21.0.2-ga/make/hotspot/gensrc/GensrcDtrace.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/gensrc/GensrcDtrace.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/gensrc/GensrcDtrace.gmk    2024-01-27 14:37:30.228709178 +0100
@@ -28,7 +28,10 @@
 
 ifeq ($(call check-jvm-feature, dtrace), true)
@@ -414,9 +414,9 @@
+  endif
+
 endif
diff -Nru jdk-jdk-21-35.orig/make/hotspot/lib/CompileDtraceLibraries.gmk jdk-jdk-21-35/make/hotspot/lib/CompileDtraceLibraries.gmk
--- jdk-jdk-21-35.orig/make/hotspot/lib/CompileDtraceLibraries.gmk    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/make/hotspot/lib/CompileDtraceLibraries.gmk    2023-08-19 19:01:20.583156217 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/CompileDtraceLibraries.gmk jdk21u-jdk-21.0.2-ga/make/hotspot/lib/CompileDtraceLibraries.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/CompileDtraceLibraries.gmk    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/lib/CompileDtraceLibraries.gmk    2024-01-27 14:37:30.282759982 +0100
@@ -0,0 +1,62 @@
+#
+# Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -480,9 +480,9 @@
+
+  endif
+endif
diff -Nru jdk-jdk-21-35.orig/make/hotspot/lib/CompileJvm.gmk jdk-jdk-21-35/make/hotspot/lib/CompileJvm.gmk
--- jdk-jdk-21-35.orig/make/hotspot/lib/CompileJvm.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/hotspot/lib/CompileJvm.gmk    2023-08-19 19:01:20.512945740 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/CompileJvm.gmk jdk21u-jdk-21.0.2-ga/make/hotspot/lib/CompileJvm.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/CompileJvm.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/lib/CompileJvm.gmk    2024-01-27 14:37:30.229133636 +0100
@@ -29,6 +29,9 @@
 include lib/JvmOverrideFiles.gmk
 include lib/JvmFlags.gmk
@@ -501,9 +501,9 @@
     CFLAGS := $(JVM_CFLAGS), \
     abstract_vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
     arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
diff -Nru jdk-jdk-21-35.orig/make/hotspot/lib/CompileLibraries.gmk jdk-jdk-21-35/make/hotspot/lib/CompileLibraries.gmk
--- jdk-jdk-21-35.orig/make/hotspot/lib/CompileLibraries.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/hotspot/lib/CompileLibraries.gmk    2023-08-19 19:01:20.513322263 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/CompileLibraries.gmk jdk21u-jdk-21.0.2-ga/make/hotspot/lib/CompileLibraries.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/CompileLibraries.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/lib/CompileLibraries.gmk    2024-01-27 14:37:30.229452284 +0100
@@ -32,6 +32,7 @@
 include HotspotCommon.gmk
 
@@ -512,9 +512,9 @@
 
 ifneq ($(GTEST_FRAMEWORK_SRC), )
   ifneq ($(CREATING_BUILDJDK), true)
diff -Nru jdk-jdk-21-35.orig/make/hotspot/lib/JvmDtraceObjects.gmk jdk-jdk-21-35/make/hotspot/lib/JvmDtraceObjects.gmk
--- jdk-jdk-21-35.orig/make/hotspot/lib/JvmDtraceObjects.gmk    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/make/hotspot/lib/JvmDtraceObjects.gmk    2023-08-19 19:01:20.583553942 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/JvmDtraceObjects.gmk jdk21u-jdk-21.0.2-ga/make/hotspot/lib/JvmDtraceObjects.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/JvmDtraceObjects.gmk    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/lib/JvmDtraceObjects.gmk    2024-01-27 14:37:30.283030985 +0100
@@ -0,0 +1,122 @@
+#
+# Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -638,9 +638,9 @@
+
+  endif
+endif
diff -Nru jdk-jdk-21-35.orig/make/hotspot/lib/JvmMapfile.gmk jdk-jdk-21-35/make/hotspot/lib/JvmMapfile.gmk
--- jdk-jdk-21-35.orig/make/hotspot/lib/JvmMapfile.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/hotspot/lib/JvmMapfile.gmk    2023-08-19 19:01:20.513809056 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/JvmMapfile.gmk jdk21u-jdk-21.0.2-ga/make/hotspot/lib/JvmMapfile.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/lib/JvmMapfile.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/lib/JvmMapfile.gmk    2024-01-27 14:37:30.229875189 +0100
@@ -48,6 +48,18 @@
   endif
 endif
@@ -681,9 +681,9 @@
 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.
diff -Nru jdk-jdk-21-35.orig/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp jdk-jdk-21-35/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp
--- jdk-jdk-21-35.orig/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp    2023-08-19 19:01:20.584233694 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp jdk21u-jdk-21.0.2-ga/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp    2024-01-27 14:37:30.283494770 +0100
@@ -0,0 +1,316 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -1001,9 +1001,9 @@
+    }
+    return generateJvmOffsets(gen_var);
+}
diff -Nru jdk-jdk-21-35.orig/make/hotspot/symbols/symbols-solaris jdk-jdk-21-35/make/hotspot/symbols/symbols-solaris
--- jdk-jdk-21-35.orig/make/hotspot/symbols/symbols-solaris    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/make/hotspot/symbols/symbols-solaris    2023-08-19 19:01:20.584625278 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/symbols/symbols-solaris jdk21u-jdk-21.0.2-ga/make/hotspot/symbols/symbols-solaris
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/symbols/symbols-solaris    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/symbols/symbols-solaris    2024-01-27 14:37:30.283777525 +0100
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
@@ -1030,9 +1030,9 @@
+
+JVM_handle_solaris_signal
+sysThreadAvailableStackWithSlack
diff -Nru jdk-jdk-21-35.orig/make/hotspot/symbols/symbols-solaris-dtrace-compiler1 jdk-jdk-21-35/make/hotspot/symbols/symbols-solaris-dtrace-compiler1
--- jdk-jdk-21-35.orig/make/hotspot/symbols/symbols-solaris-dtrace-compiler1    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/make/hotspot/symbols/symbols-solaris-dtrace-compiler1    2023-08-19 19:01:20.584953503 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/symbols/symbols-solaris-dtrace-compiler1 jdk21u-jdk-21.0.2-ga/make/hotspot/symbols/symbols-solaris-dtrace-compiler1
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/symbols/symbols-solaris-dtrace-compiler1    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/symbols/symbols-solaris-dtrace-compiler1    2024-01-27 14:37:30.284006922 +0100
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
@@ -1068,9 +1068,9 @@
+__1cSDeoptimizationBlobG__vtbl_
+
+__JvmOffsets
diff -Nru jdk-jdk-21-35.orig/make/hotspot/symbols/symbols-solaris-dtrace-compiler2 jdk-jdk-21-35/make/hotspot/symbols/symbols-solaris-dtrace-compiler2
--- jdk-jdk-21-35.orig/make/hotspot/symbols/symbols-solaris-dtrace-compiler2    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/make/hotspot/symbols/symbols-solaris-dtrace-compiler2    2023-08-19 19:01:20.585311116 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/hotspot/symbols/symbols-solaris-dtrace-compiler2 jdk21u-jdk-21.0.2-ga/make/hotspot/symbols/symbols-solaris-dtrace-compiler2
--- jdk21u-jdk-21.0.2-ga.orig/make/hotspot/symbols/symbols-solaris-dtrace-compiler2    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/hotspot/symbols/symbols-solaris-dtrace-compiler2    2024-01-27 14:37:30.284233384 +0100
@@ -0,0 +1,36 @@
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
@@ -1108,9 +1108,9 @@
+__1cQUncommonTrapBlobG__vtbl_
+
+__JvmOffsets
diff -Nru jdk-jdk-21-35.orig/make/ide/visualstudio/hotspot/CreateVSProject.gmk jdk-jdk-21-35/make/ide/visualstudio/hotspot/CreateVSProject.gmk
--- jdk-jdk-21-35.orig/make/ide/visualstudio/hotspot/CreateVSProject.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/ide/visualstudio/hotspot/CreateVSProject.gmk    2023-08-19 19:01:20.514287018 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/ide/visualstudio/hotspot/CreateVSProject.gmk jdk21u-jdk-21.0.2-ga/make/ide/visualstudio/hotspot/CreateVSProject.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/ide/visualstudio/hotspot/CreateVSProject.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/ide/visualstudio/hotspot/CreateVSProject.gmk    2024-01-27 14:37:30.230252674 +0100
@@ -76,6 +76,7 @@
     -ignorePath linux \
     -ignorePath posix \
@@ -1119,9 +1119,9 @@
     -ignorePath x86_32 \
     -ignorePath zero \
       #
diff -Nru jdk-jdk-21-35.orig/make/langtools/build.xml jdk-jdk-21-35/make/langtools/build.xml
--- jdk-jdk-21-35.orig/make/langtools/build.xml    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/langtools/build.xml    2023-08-19 19:01:20.514796986 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/langtools/build.xml jdk21u-jdk-21.0.2-ga/make/langtools/build.xml
--- jdk21u-jdk-21.0.2-ga.orig/make/langtools/build.xml    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/langtools/build.xml    2024-01-27 14:37:30.230675474 +0100
@@ -100,7 +100,7 @@
     <property name="xpatch.noquotes.cmd" value="--patch-module=${xpatch.noquotes.rest}"/>
 
@@ -1131,9 +1131,9 @@
          executables; regrettably, that is OS-specific. -->
     <condition property="java.marker" value="bin/java">
         <os family="unix"/>
diff -Nru jdk-jdk-21-35.orig/make/modules/java.base/Copy.gmk jdk-jdk-21-35/make/modules/java.base/Copy.gmk
--- jdk-jdk-21-35.orig/make/modules/java.base/Copy.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.base/Copy.gmk    2023-08-19 19:01:20.515271726 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/Copy.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.base/Copy.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/Copy.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.base/Copy.gmk    2024-01-27 14:37:30.231112351 +0100
@@ -190,7 +190,7 @@
 
 TARGETS += $(NET_PROPERTIES_DST)
@@ -1143,10 +1143,10 @@
   $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
       FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
       DEST := $(CONF_DST_DIR)/sdp, \
diff -Nru jdk-jdk-21-35.orig/make/modules/java.base/gensrc/GensrcMisc.gmk jdk-jdk-21-35/make/modules/java.base/gensrc/GensrcMisc.gmk
--- jdk-jdk-21-35.orig/make/modules/java.base/gensrc/GensrcMisc.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.base/gensrc/GensrcMisc.gmk    2023-08-19 19:01:20.516714787 +0200
@@ -138,6 +138,21 @@
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/gensrc/GensrcMisc.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.base/gensrc/GensrcMisc.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/gensrc/GensrcMisc.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.base/gensrc/GensrcMisc.gmk    2024-01-27 14:37:30.232298330 +0100
@@ -136,6 +136,21 @@
 
 endif
 
@@ -1168,9 +1168,9 @@
 # Create the javax/crypto/JceSecurity.class, using the build default.
 #
 ifeq ($(UNLIMITED_CRYPTO), true)
diff -Nru jdk-jdk-21-35.orig/make/modules/java.base/Launcher.gmk jdk-jdk-21-35/make/modules/java.base/Launcher.gmk
--- jdk-jdk-21-35.orig/make/modules/java.base/Launcher.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.base/Launcher.gmk    2023-08-19 19:01:20.515732296 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/Launcher.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.base/Launcher.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/Launcher.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.base/Launcher.gmk    2024-01-27 14:37:30.231477989 +0100
@@ -64,6 +64,7 @@
       CFLAGS := $(CFLAGS_JDKEXE) \
           -I$(TOPDIR)/src/$(MODULE)/share/native/libjli, \
@@ -1188,9 +1188,9 @@
   $(eval $(call SetupJdkExecutable, BUILD_JSPAWNHELPER, \
       NAME := jspawnhelper, \
       SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
diff -Nru jdk-jdk-21-35.orig/make/modules/java.base/lib/CoreLibraries.gmk jdk-jdk-21-35/make/modules/java.base/lib/CoreLibraries.gmk
--- jdk-jdk-21-35.orig/make/modules/java.base/lib/CoreLibraries.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.base/lib/CoreLibraries.gmk    2023-08-19 19:01:20.517278854 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/lib/CoreLibraries.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.base/lib/CoreLibraries.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/lib/CoreLibraries.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.base/lib/CoreLibraries.gmk    2024-01-27 14:37:30.232765124 +0100
@@ -26,7 +26,7 @@
 ##########################################################################################
 
@@ -1216,9 +1216,9 @@
     LIBS_aix := $(LIBDL),\
     LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
     LIBS_windows := advapi32.lib comctl32.lib user32.lib, \
diff -Nru jdk-jdk-21-35.orig/make/modules/java.base/Lib.gmk jdk-jdk-21-35/make/modules/java.base/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/java.base/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.base/Lib.gmk    2023-08-19 19:01:20.516261981 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.base/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.base/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.base/Lib.gmk    2024-01-27 14:37:30.231917319 +0100
@@ -55,6 +55,7 @@
     LDFLAGS_windows := -delayload:secur32.dll -delayload:iphlpapi.dll, \
     LIBS_unix := -ljvm -ljava, \
@@ -1244,9 +1244,9 @@
         LIBS_aix := $(LIBDL), \
     ))
 
diff -Nru jdk-jdk-21-35.orig/make/modules/java.desktop/Gensrc.gmk jdk-jdk-21-35/make/modules/java.desktop/Gensrc.gmk
--- jdk-jdk-21-35.orig/make/modules/java.desktop/Gensrc.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.desktop/Gensrc.gmk    2023-08-19 19:01:20.517702785 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.desktop/Gensrc.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.desktop/Gensrc.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.desktop/Gensrc.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.desktop/Gensrc.gmk    2024-01-27 14:37:30.233115094 +0100
@@ -32,7 +32,7 @@
   include gensrc/GensrcIcons.gmk
 endif
@@ -1256,9 +1256,9 @@
   include gensrc/GensrcX11Wrappers.gmk
 endif
 
diff -Nru jdk-jdk-21-35.orig/make/modules/java.desktop/lib/Awt2dLibraries.gmk jdk-jdk-21-35/make/modules/java.desktop/lib/Awt2dLibraries.gmk
--- jdk-jdk-21-35.orig/make/modules/java.desktop/lib/Awt2dLibraries.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.desktop/lib/Awt2dLibraries.gmk    2023-08-19 19:01:20.518932864 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.desktop/lib/Awt2dLibraries.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.desktop/lib/Awt2dLibraries.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.desktop/lib/Awt2dLibraries.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.desktop/lib/Awt2dLibraries.gmk    2024-01-27 14:37:30.234114922 +0100
@@ -77,7 +77,7 @@
       #
 endif
@@ -1276,7 +1276,7 @@
     LIBS_aix := $(LIBDL),\
     LIBS_macosx := -lmlib_image \
         -framework Cocoa \
@@ -393,6 +394,7 @@
@@ -395,6 +396,7 @@
       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
       LIBS_unix := -lawt -ljvm -ljava, \
       LIBS_linux := $(LIBM) $(LIBDL), \
@@ -1284,7 +1284,7 @@
   ))
 
   $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
@@ -450,7 +452,7 @@
@@ -454,7 +456,7 @@
                         -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H \
                         -DHB_NO_PRAGMA_GCC_DIAGNOSTIC
    endif
@@ -1293,7 +1293,7 @@
      HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
    endif
 
@@ -612,7 +614,10 @@
@@ -623,7 +625,10 @@
   ifeq ($(call isTargetOs, macosx), true)
     JAWT_LIBS := -lawt_lwawt
   else
@@ -1305,7 +1305,7 @@
     ifeq ($(ENABLE_HEADLESS_ONLY), false)
       JAWT_LIBS += -lawt_xawt
     else
@@ -639,6 +644,7 @@
@@ -650,6 +655,7 @@
       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
       LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
       LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \
@@ -1313,9 +1313,9 @@
       LIBS_macosx := -framework Cocoa, \
   ))
 
diff -Nru jdk-jdk-21-35.orig/make/modules/java.desktop/Lib.gmk jdk-jdk-21-35/make/modules/java.desktop/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/java.desktop/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.desktop/Lib.gmk    2023-08-19 19:01:20.518118221 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.desktop/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.desktop/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.desktop/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.desktop/Lib.gmk    2024-01-27 14:37:30.233426840 +0100
@@ -47,10 +47,15 @@
       -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \
       -DUSE_PORTS=TRUE \
@@ -1334,9 +1334,9 @@
   ifeq ($(call isTargetOs, macosx), true)
     LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX
   endif
diff -Nru jdk-jdk-21-35.orig/make/modules/java.instrument/Lib.gmk jdk-jdk-21-35/make/modules/java.instrument/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/java.instrument/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.instrument/Lib.gmk    2023-08-19 19:01:20.519385464 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.instrument/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.instrument/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.instrument/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.instrument/Lib.gmk    2024-01-27 14:37:30.234469008 +0100
@@ -44,11 +44,13 @@
         $(call SET_SHARED_LIBRARY_ORIGIN) \
         $(LIBINSTRUMENT_LDFLAGS), \
@@ -1351,9 +1351,9 @@
     LIBS_aix := -liconv -ljli_static $(LIBDL), \
     LIBS_macosx := -ljli -liconv -framework Cocoa -framework Security \
         -framework ApplicationServices, \
diff -Nru jdk-jdk-21-35.orig/make/modules/java.management/Lib.gmk jdk-jdk-21-35/make/modules/java.management/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/java.management/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.management/Lib.gmk    2023-08-19 19:01:20.519873966 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.management/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.management/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.management/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.management/Lib.gmk    2024-01-27 14:37:30.234878792 +0100
@@ -28,7 +28,7 @@
 ################################################################################
 
@@ -1371,9 +1371,9 @@
     LIBS_aix := -lperfstat,\
     LIBS_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \
 ))
diff -Nru jdk-jdk-21-35.orig/make/modules/java.prefs/Lib.gmk jdk-jdk-21-35/make/modules/java.prefs/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/java.prefs/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/java.prefs/Lib.gmk    2023-08-19 19:01:20.520282710 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/java.prefs/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/java.prefs/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/java.prefs/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/java.prefs/Lib.gmk    2024-01-27 14:37:30.235254942 +0100
@@ -41,6 +41,7 @@
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
@@ -1382,9 +1382,9 @@
     LIBS_aix := -ljava, \
     LIBS_macosx := -framework CoreFoundation -framework Foundation, \
     LIBS_windows := advapi32.lib jvm.lib $(WIN_JAVA_LIB), \
diff -Nru jdk-jdk-21-35.orig/make/modules/jdk.attach/Lib.gmk jdk-jdk-21-35/make/modules/jdk.attach/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/jdk.attach/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/jdk.attach/Lib.gmk    2023-08-19 19:01:20.520702773 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.attach/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/jdk.attach/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.attach/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/jdk.attach/Lib.gmk    2024-01-27 14:37:30.235597729 +0100
@@ -42,6 +42,7 @@
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -1393,9 +1393,9 @@
     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \
 ))
 
diff -Nru jdk-jdk-21-35.orig/make/modules/jdk.crypto.cryptoki/Copy.gmk jdk-jdk-21-35/make/modules/jdk.crypto.cryptoki/Copy.gmk
--- jdk-jdk-21-35.orig/make/modules/jdk.crypto.cryptoki/Copy.gmk    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/make/modules/jdk.crypto.cryptoki/Copy.gmk    2023-08-19 19:01:20.585704157 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.crypto.cryptoki/Copy.gmk jdk21u-jdk-21.0.2-ga/make/modules/jdk.crypto.cryptoki/Copy.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.crypto.cryptoki/Copy.gmk    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/jdk.crypto.cryptoki/Copy.gmk    2024-01-27 14:37:30.284522116 +0100
@@ -0,0 +1,45 @@
+#
+# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -1442,9 +1442,9 @@
+endif
+
+################################################################################
diff -Nru jdk-jdk-21-35.orig/make/modules/jdk.hotspot.agent/Lib.gmk jdk-jdk-21-35/make/modules/jdk.hotspot.agent/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/jdk.hotspot.agent/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/jdk.hotspot.agent/Lib.gmk    2023-08-19 19:01:20.521169167 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.hotspot.agent/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/jdk.hotspot.agent/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.hotspot.agent/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/jdk.hotspot.agent/Lib.gmk    2024-01-27 14:37:30.235984694 +0100
@@ -67,10 +67,11 @@
     CFLAGS := $(CFLAGS_JDKLIB) $(SA_CFLAGS), \
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \
@@ -1458,9 +1458,9 @@
     LIBS_macosx := -framework Foundation \
         -framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
     LIBS_windows := dbgeng.lib $(WIN_JAVA_LIB), \
diff -Nru jdk-jdk-21-35.orig/make/modules/jdk.jdwp.agent/Lib.gmk jdk-jdk-21-35/make/modules/jdk.jdwp.agent/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/jdk.jdwp.agent/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/jdk.jdwp.agent/Lib.gmk    2023-08-19 19:01:20.521647860 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.jdwp.agent/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/jdk.jdwp.agent/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.jdwp.agent/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/jdk.jdwp.agent/Lib.gmk    2024-01-27 14:37:30.236387365 +0100
@@ -38,6 +38,7 @@
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -1477,9 +1477,9 @@
     LIBS_macosx := -liconv, \
     LIBS_aix := -liconv, \
 ))
diff -Nru jdk-jdk-21-35.orig/make/modules/jdk.management/Lib.gmk jdk-jdk-21-35/make/modules/jdk.management/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/jdk.management/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/jdk.management/Lib.gmk    2023-08-19 19:01:20.522110472 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.management/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/jdk.management/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.management/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/jdk.management/Lib.gmk    2024-01-27 14:37:30.236788170 +0100
@@ -35,7 +35,7 @@
 endif
 
@@ -1497,9 +1497,9 @@
     LIBS_aix := -lperfstat,\
     LIBS_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \
 ))
diff -Nru jdk-jdk-21-35.orig/make/modules/jdk.net/Lib.gmk jdk-jdk-21-35/make/modules/jdk.net/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/jdk.net/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/jdk.net/Lib.gmk    2023-08-19 19:01:20.522538367 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.net/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/jdk.net/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.net/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/jdk.net/Lib.gmk    2024-01-27 14:37:30.237143671 +0100
@@ -36,6 +36,7 @@
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -1508,9 +1508,9 @@
       LIBS_linux := -ljvm, \
       LIBS_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB), \
   ))
diff -Nru jdk-jdk-21-35.orig/make/modules/jdk.sctp/Lib.gmk jdk-jdk-21-35/make/modules/jdk.sctp/Lib.gmk
--- jdk-jdk-21-35.orig/make/modules/jdk.sctp/Lib.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/modules/jdk.sctp/Lib.gmk    2023-08-19 19:01:20.522971847 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.sctp/Lib.gmk jdk21u-jdk-21.0.2-ga/make/modules/jdk.sctp/Lib.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/modules/jdk.sctp/Lib.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/modules/jdk.sctp/Lib.gmk    2024-01-27 14:37:30.237487238 +0100
@@ -42,6 +42,7 @@
             $(call SET_SHARED_LIBRARY_ORIGIN), \
         LIBS_unix := -lnio -lnet -ljava -ljvm, \
@@ -1519,10 +1519,10 @@
     ))
 
     TARGETS += $(BUILD_LIBSCTP)
diff -Nru jdk-jdk-21-35.orig/make/RunTestsPrebuilt.gmk jdk-jdk-21-35/make/RunTestsPrebuilt.gmk
--- jdk-jdk-21-35.orig/make/RunTestsPrebuilt.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/RunTestsPrebuilt.gmk    2023-08-19 19:01:20.503811371 +0200
@@ -163,6 +163,8 @@
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/RunTestsPrebuilt.gmk jdk21u-jdk-21.0.2-ga/make/RunTestsPrebuilt.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/RunTestsPrebuilt.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/RunTestsPrebuilt.gmk    2024-01-27 14:37:30.221277013 +0100
@@ -168,6 +168,8 @@
     OPENJDK_TARGET_OS := linux
   else ifeq ($(UNAME_OS), Darwin)
     OPENJDK_TARGET_OS := macosx
@@ -1531,7 +1531,7 @@
   else
     OPENJDK_TARGET_OS := $(UNAME_OS)
   endif
@@ -172,15 +174,28 @@
@@ -180,15 +182,28 @@
 # Assume little endian unless otherwise specified
 OPENJDK_TARGET_CPU_ENDIAN := little
 
@@ -1568,7 +1568,7 @@
 endif
 
 OPENJDK_TARGET_CPU_ARCH := $(OPENJDK_TARGET_CPU)
@@ -205,6 +220,11 @@
@@ -213,6 +228,11 @@
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu)
   MEMORY_SIZE := $(shell $(EXPR) `/usr/sbin/sysctl -n hw.memsize` / 1024 / 1024)
@@ -1580,10 +1580,10 @@
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
diff -Nru jdk-jdk-21-35.orig/make/RunTestsPrebuiltSpec.gmk jdk-jdk-21-35/make/RunTestsPrebuiltSpec.gmk
--- jdk-jdk-21-35.orig/make/RunTestsPrebuiltSpec.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/RunTestsPrebuiltSpec.gmk    2023-08-19 19:01:20.504216734 +0200
@@ -171,6 +171,16 @@
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/RunTestsPrebuiltSpec.gmk jdk21u-jdk-21.0.2-ga/make/RunTestsPrebuiltSpec.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/RunTestsPrebuiltSpec.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/RunTestsPrebuiltSpec.gmk    2024-01-27 14:37:30.221632849 +0100
@@ -173,6 +173,16 @@
 FILE := file
 ULIMIT := ulimit
 
@@ -1600,9 +1600,9 @@
 ifeq ($(OPENJDK_BUILD_OS), windows)
   PATHTOOL := cygpath
 endif
diff -Nru jdk-jdk-21-35.orig/make/scripts/compare_exceptions.sh.incl jdk-jdk-21-35/make/scripts/compare_exceptions.sh.incl
--- jdk-jdk-21-35.orig/make/scripts/compare_exceptions.sh.incl    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/scripts/compare_exceptions.sh.incl    2023-08-19 19:01:20.524167923 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/scripts/compare_exceptions.sh.incl jdk21u-jdk-21.0.2-ga/make/scripts/compare_exceptions.sh.incl
--- jdk21u-jdk-21.0.2-ga.orig/make/scripts/compare_exceptions.sh.incl    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/scripts/compare_exceptions.sh.incl    2024-01-27 14:37:30.238540848 +0100
@@ -45,6 +45,20 @@
         ./hotspot/gtest/server/libjvm.so
         "
@@ -1624,9 +1624,9 @@
 elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then
   SKIP_BIN_DIFF="true"
   SKIP_FULLDUMP_DIFF="true"
diff -Nru jdk-jdk-21-35.orig/make/scripts/compare.sh jdk-jdk-21-35/make/scripts/compare.sh
--- jdk-jdk-21-35.orig/make/scripts/compare.sh    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/scripts/compare.sh    2023-08-19 19:01:20.523753692 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/scripts/compare.sh jdk21u-jdk-21.0.2-ga/make/scripts/compare.sh
--- jdk21u-jdk-21.0.2-ga.orig/make/scripts/compare.sh    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/scripts/compare.sh    2024-01-27 14:37:30.238228566 +0100
@@ -73,7 +73,14 @@
 # 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.
@@ -1687,9 +1687,9 @@
     elif [ "$OPENJDK_TARGET_OS" = "aix" ]; then
         $OBJDUMP -T $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
         $OBJDUMP -T $ORIG_THIS_FILE  2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
diff -Nru jdk-jdk-21-35.orig/make/scripts/hide_important_warnings_from_javac.sh jdk-jdk-21-35/make/scripts/hide_important_warnings_from_javac.sh
--- jdk-jdk-21-35.orig/make/scripts/hide_important_warnings_from_javac.sh    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/scripts/hide_important_warnings_from_javac.sh    2023-08-19 19:01:20.524574375 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/scripts/hide_important_warnings_from_javac.sh jdk21u-jdk-21.0.2-ga/make/scripts/hide_important_warnings_from_javac.sh
--- jdk21u-jdk-21.0.2-ga.orig/make/scripts/hide_important_warnings_from_javac.sh    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/scripts/hide_important_warnings_from_javac.sh    2024-01-27 14:37:30.238853586 +0100
@@ -22,8 +22,13 @@
 # questions.
 #
@@ -1706,9 +1706,9 @@
 #
 EXP="Note: Some input files use or override a deprecated API."
 EXP="${EXP}|Note: Recompile with -Xlint:deprecation for details."
diff -Nru jdk-jdk-21-35.orig/make/test/JtregNativeHotspot.gmk jdk-jdk-21-35/make/test/JtregNativeHotspot.gmk
--- jdk-jdk-21-35.orig/make/test/JtregNativeHotspot.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/test/JtregNativeHotspot.gmk    2023-08-19 19:01:20.525403574 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/test/JtregNativeHotspot.gmk jdk21u-jdk-21.0.2-ga/make/test/JtregNativeHotspot.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/test/JtregNativeHotspot.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/test/JtregNativeHotspot.gmk    2024-01-27 14:37:30.239563753 +0100
@@ -865,6 +865,10 @@
 
 BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
@@ -1720,9 +1720,9 @@
 ifeq ($(call isTargetOs, windows), true)
   BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
   BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c libCompleteExit.c libTestPsig.c libnativeStack.c exeGetCreatedJavaVMs.c
diff -Nru jdk-jdk-21-35.orig/make/test/JtregNativeJdk.gmk jdk-jdk-21-35/make/test/JtregNativeJdk.gmk
--- jdk-jdk-21-35.orig/make/test/JtregNativeJdk.gmk    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/make/test/JtregNativeJdk.gmk    2023-08-19 19:01:20.525862678 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/make/test/JtregNativeJdk.gmk jdk21u-jdk-21.0.2-ga/make/test/JtregNativeJdk.gmk
--- jdk21u-jdk-21.0.2-ga.orig/make/test/JtregNativeJdk.gmk    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/make/test/JtregNativeJdk.gmk    2024-01-27 14:37:30.239894654 +0100
@@ -107,6 +107,9 @@
   ifeq ($(call isTargetOs, linux), true)
     BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava
@@ -1733,9 +1733,9 @@
   endif
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := -ljli
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := -ljvm
diff -Nru jdk-jdk-21-35.orig/src/hotspot/cpu/x86/globalDefinitions_x86.hpp jdk-jdk-21-35/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
--- jdk-jdk-21-35.orig/src/hotspot/cpu/x86/globalDefinitions_x86.hpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/cpu/x86/globalDefinitions_x86.hpp    2023-08-19 19:01:20.526584444 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/cpu/x86/globalDefinitions_x86.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/cpu/x86/globalDefinitions_x86.hpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/cpu/x86/globalDefinitions_x86.hpp    2024-01-27 14:37:30.240355653 +0100
@@ -67,7 +67,7 @@
 #define INCLUDE_RTM_OPT 1
 #endif
@@ -1745,9 +1745,9 @@
 #define SUPPORT_RESERVED_STACK_AREA
 #endif
 
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/posix/include/jvm_md.h jdk-jdk-21-35/src/hotspot/os/posix/include/jvm_md.h
--- jdk-jdk-21-35.orig/src/hotspot/os/posix/include/jvm_md.h    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/os/posix/include/jvm_md.h    2023-08-19 19:01:20.527181854 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/posix/include/jvm_md.h jdk21u-jdk-21.0.2-ga/src/hotspot/os/posix/include/jvm_md.h
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/posix/include/jvm_md.h    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/posix/include/jvm_md.h    2024-01-27 14:37:30.240764929 +0100
@@ -54,7 +54,7 @@
 #endif
 #define JNI_LIB_NAME(NAME) JNI_LIB_PREFIX NAME JNI_LIB_SUFFIX
@@ -1772,9 +1772,9 @@
+#define JSIG_VERSION_1_4_1   0x30140100
+
 #endif /* !_JAVASOFT_JVM_MD_H_ */
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/posix/os_posix.cpp jdk-jdk-21-35/src/hotspot/os/posix/os_posix.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os/posix/os_posix.cpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/os/posix/os_posix.cpp    2023-08-19 19:01:20.528079763 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/posix/os_posix.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/posix/os_posix.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/posix/os_posix.cpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/posix/os_posix.cpp    2024-01-27 14:37:30.241453453 +0100
@@ -504,7 +504,7 @@
   st->print("%d", sysconf(_SC_CHILD_MAX));
 
@@ -1797,9 +1797,9 @@
   // 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);
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/posix/os_posix.inline.hpp jdk-jdk-21-35/src/hotspot/os/posix/os_posix.inline.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os/posix/os_posix.inline.hpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/os/posix/os_posix.inline.hpp    2023-08-19 19:01:20.528511153 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/posix/os_posix.inline.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/posix/os_posix.inline.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/posix/os_posix.inline.hpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/posix/os_posix.inline.hpp    2024-01-27 14:37:30.241763862 +0100
@@ -34,8 +34,10 @@
 #include <sys/socket.h>
 #include <netdb.h>
@@ -1811,9 +1811,9 @@
 
 // Platform Mutex/Monitor implementation
 
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/posix/vmError_posix.cpp jdk-jdk-21-35/src/hotspot/os/posix/vmError_posix.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os/posix/vmError_posix.cpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/os/posix/vmError_posix.cpp    2023-08-19 19:01:20.528942059 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/posix/vmError_posix.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/posix/vmError_posix.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/posix/vmError_posix.cpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/posix/vmError_posix.cpp    2024-01-27 14:37:30.242073659 +0100
@@ -40,6 +40,9 @@
 #include <sys/syscall.h>
 #include <unistd.h>
@@ -1824,9 +1824,9 @@
 #ifdef AIX
 #include <unistd.h>
 #endif
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/attachListener_solaris.cpp jdk-jdk-21-35/src/hotspot/os/solaris/attachListener_solaris.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/attachListener_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/attachListener_solaris.cpp    2023-08-19 19:01:20.586513586 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/attachListener_solaris.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/attachListener_solaris.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/attachListener_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/attachListener_solaris.cpp    2024-01-27 14:37:30.285119239 +0100
@@ -0,0 +1,749 @@
+/*
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -2577,9 +2577,9 @@
+void AttachListener::pd_detachall() {
+  DTrace::detach_all_clients();
+}
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/c1_globals_solaris.hpp jdk-jdk-21-35/src/hotspot/os/solaris/c1_globals_solaris.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/c1_globals_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/c1_globals_solaris.hpp    2023-08-19 19:01:20.586892141 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/c1_globals_solaris.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/c1_globals_solaris.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/c1_globals_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/c1_globals_solaris.hpp    2024-01-27 14:37:30.285353720 +0100
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -2617,9 +2617,9 @@
+//
+
+#endif // OS_SOLARIS_C1_GLOBALS_SOLARIS_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/c2_globals_solaris.hpp jdk-jdk-21-35/src/hotspot/os/solaris/c2_globals_solaris.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/c2_globals_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/c2_globals_solaris.hpp    2023-08-19 19:01:20.587232688 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/c2_globals_solaris.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/c2_globals_solaris.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/c2_globals_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/c2_globals_solaris.hpp    2024-01-27 14:37:30.285584537 +0100
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -2657,9 +2657,9 @@
+//
+
+#endif // OS_SOLARIS_C2_GLOBALS_SOLARIS_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/decoder_solaris.cpp jdk-jdk-21-35/src/hotspot/os/solaris/decoder_solaris.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/decoder_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/decoder_solaris.cpp    2023-08-19 19:01:20.587550697 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/decoder_solaris.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/decoder_solaris.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/decoder_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/decoder_solaris.cpp    2024-01-27 14:37:30.285817665 +0100
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2693,9 +2693,9 @@
+  return !cplus_demangle(symbol, buf, (size_t)buflen);
+}
+
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/dtrace/jhelper.d jdk-jdk-21-35/src/hotspot/os/solaris/dtrace/jhelper.d
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/dtrace/jhelper.d    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/dtrace/jhelper.d    2023-08-19 19:01:20.588654717 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/dtrace/jhelper.d jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/dtrace/jhelper.d
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/dtrace/jhelper.d    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/dtrace/jhelper.d    2024-01-27 14:37:30.286643311 +0100
@@ -0,0 +1,540 @@
+/*
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -3237,9 +3237,9 @@
+{
+  NULL;
+}
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/globals_solaris.hpp jdk-jdk-21-35/src/hotspot/os/solaris/globals_solaris.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/globals_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/globals_solaris.hpp    2023-08-19 19:01:20.588980529 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/globals_solaris.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/globals_solaris.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/globals_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/globals_solaris.hpp    2024-01-27 14:37:30.286893903 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
@@ -3290,9 +3290,9 @@
+define_pd_global(bool, UseThreadPriorities, false);
+
+#endif // OS_SOLARIS_GLOBALS_SOLARIS_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/os_perf_solaris.cpp jdk-jdk-21-35/src/hotspot/os/solaris/os_perf_solaris.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/os_perf_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/os_perf_solaris.cpp    2023-08-19 19:01:20.590292237 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/os_perf_solaris.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/os_perf_solaris.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/os_perf_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/os_perf_solaris.cpp    2024-01-27 14:37:30.287919862 +0100
@@ -0,0 +1,808 @@
+/*
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -4102,9 +4102,9 @@
+int NetworkPerformanceInterface::network_utilization(NetworkInterface** network_interfaces) const {
+  return _impl->network_utilization(network_interfaces);
+}
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/os_solaris.cpp jdk-jdk-21-35/src/hotspot/os/solaris/os_solaris.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/os_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/os_solaris.cpp    2023-08-19 19:01:20.592668899 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/os_solaris.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/os_solaris.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/os_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/os_solaris.cpp    2024-01-27 14:37:30.289827857 +0100
@@ -0,0 +1,3129 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
@@ -7235,9 +7235,9 @@
+void os::jfr_report_memory_info() {}
+
+#endif // INCLUDE_JFR
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/os_solaris.hpp jdk-jdk-21-35/src/hotspot/os/solaris/os_solaris.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/os_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/os_solaris.hpp    2023-08-19 19:01:20.593099149 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/os_solaris.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/os_solaris.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/os_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/os_solaris.hpp    2024-01-27 14:37:30.290167827 +0100
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
@@ -7437,10 +7437,10 @@
+
+};
+#endif // OS_SOLARIS_OS_SOLARIS_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/os_solaris.inline.hpp jdk-jdk-21-35/src/hotspot/os/solaris/os_solaris.inline.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/os_solaris.inline.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/os_solaris.inline.hpp    2023-08-19 19:01:20.593438422 +0200
@@ -0,0 +1,68 @@
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/os_solaris.inline.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/os_solaris.inline.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/os_solaris.inline.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/os_solaris.inline.hpp    2024-01-27 14:37:30.290462647 +0100
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -7503,15 +7503,19 @@
+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; }
+
+//////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+inline bool os::numa_has_group_homing()     { return true;  }
+
+#endif // OS_SOLARIS_OS_SOLARIS_INLINE_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/osThread_solaris.cpp jdk-jdk-21-35/src/hotspot/os/solaris/osThread_solaris.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/osThread_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/osThread_solaris.cpp    2023-08-19 19:01:20.589290468 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/osThread_solaris.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/osThread_solaris.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/osThread_solaris.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/osThread_solaris.cpp    2024-01-27 14:37:30.287133736 +0100
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -7560,9 +7564,9 @@
+
+void OSThread::pd_destroy() {
+}
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/osThread_solaris.hpp jdk-jdk-21-35/src/hotspot/os/solaris/osThread_solaris.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/osThread_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/osThread_solaris.hpp    2023-08-19 19:01:20.589636025 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/osThread_solaris.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/osThread_solaris.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/osThread_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/osThread_solaris.hpp    2024-01-27 14:37:30.287397750 +0100
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -7657,9 +7661,9 @@
+  void pd_destroy();
+
+#endif // OS_SOLARIS_OSTHREAD_SOLARIS_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os/solaris/vmStructs_solaris.hpp jdk-jdk-21-35/src/hotspot/os/solaris/vmStructs_solaris.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os/solaris/vmStructs_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os/solaris/vmStructs_solaris.hpp    2023-08-19 19:01:20.593762739 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/vmStructs_solaris.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/vmStructs_solaris.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os/solaris/vmStructs_solaris.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os/solaris/vmStructs_solaris.hpp    2024-01-27 14:37:30.290708195 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -7705,9 +7709,9 @@
+#define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function)
+
+#endif // OS_SOLARIS_VMSTRUCTS_SOLARIS_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp    2023-08-19 19:01:20.594201045 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/assembler_solaris_x86.cpp    2024-01-27 14:37:30.291028282 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -7746,9 +7750,9 @@
+  pop(rdx);
+  pop(rax);
+}
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp    2023-08-19 19:01:20.594607048 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp    2024-01-27 14:37:30.291339980 +0100
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -7932,9 +7936,9 @@
+}
+
+#endif // OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.hpp    2023-08-19 19:01:20.594924287 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.hpp    2024-01-27 14:37:30.291582989 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -7996,9 +8000,9 @@
+}
+
+#endif // OS_CPU_SOLARIS_X86_BYTES_SOLARIS_X86_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.hpp    2023-08-19 19:01:20.595224696 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.hpp    2024-01-27 14:37:30.291811352 +0100
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -8030,9 +8034,9 @@
+// now in central copy_x86.hpp
+
+#endif // OS_CPU_SOLARIS_X86_COPY_SOLARIS_X86_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp    2023-08-19 19:01:20.595537284 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp    2024-01-27 14:37:30.292060423 +0100
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -8074,9 +8078,9 @@
+define_pd_global(size_t, HeapBaseMinAddress,     2*G);
+
+#endif // OS_CPU_SOLARIS_X86_GLOBALS_SOLARIS_X86_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.cpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.cpp    2023-08-19 19:01:20.598284084 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.cpp    2024-01-27 14:37:30.294246303 +0100
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
@@ -8175,9 +8179,9 @@
+}
+
+void JavaThread::cache_global_variables() { }
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.hpp    2023-08-19 19:01:20.598602199 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/javaThread_solaris_x86.hpp    2024-01-27 14:37:30.294488725 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -8238,9 +8242,9 @@
+  static void disable_register_stack_guard() {}
+
+#endif // OS_CPU_SOLARIS_X86_JAVATHREAD_SOLARIS_X86_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp    2023-08-19 19:01:20.595855937 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp    2024-01-27 14:37:30.292309763 +0100
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -8300,9 +8304,9 @@
+}
+
+#endif // OS_CPU_SOLARIS_X86_ORDERACCESS_SOLARIS_X86_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp    2023-08-19 19:01:20.596518553 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp    2024-01-27 14:37:30.292862580 +0100
@@ -0,0 +1,662 @@
+/*
+ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
@@ -8966,9 +8970,9 @@
+  // JDK-8050147 requires the full cache line bang for x86.
+  return VM_Version::L1_line_size();
+}
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp    2023-08-19 19:01:20.596842610 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp    2024-01-27 14:37:30.293110184 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -9025,9 +9029,9 @@
+  static bool register_code_area(char *low, char *high) { return true; }
+
+#endif // OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp    2023-08-19 19:01:20.597147144 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp    2024-01-27 14:37:30.293342346 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -9068,9 +9072,9 @@
+}
+
+#endif // OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_INLINE_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp    2023-08-19 19:01:20.597457335 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp    2024-01-27 14:37:30.293580195 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -9114,9 +9118,9 @@
+}
+
+#endif // OS_CPU_SOLARIS_X86_PREFETCH_SOLARIS_X86_INLINE_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.S jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.S
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.S    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.S    2023-08-19 19:01:20.597943493 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.S jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.S
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.S    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.S    2024-01-27 14:37:30.293987160 +0100
@@ -0,0 +1,386 @@
+#
+# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -9504,9 +9508,9 @@
+        addq     $4,%rdx
+        jg       4b
+        ret
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp    2023-08-19 19:01:20.599213766 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/vm_version_solaris_x86.cpp    2024-01-27 14:37:30.294960795 +0100
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -9536,9 +9540,9 @@
+#include "runtime/os.hpp"
+#include "runtime/vm_version.hpp"
+
diff -Nru jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp
--- jdk-jdk-21-35.orig/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp    2023-08-19 19:01:20.598916690 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp    2024-01-27 14:37:30.294730223 +0100
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -9580,9 +9584,9 @@
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+
+#endif // OS_CPU_SOLARIS_X86_VMSTRUCTS_SOLARIS_X86_HPP
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/c1/c1_LIR.cpp jdk-jdk-21-35/src/hotspot/share/c1/c1_LIR.cpp
--- jdk-jdk-21-35.orig/src/hotspot/share/c1/c1_LIR.cpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/c1/c1_LIR.cpp    2023-08-19 19:01:20.529897733 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/c1/c1_LIR.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/c1/c1_LIR.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/c1/c1_LIR.cpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/c1/c1_LIR.cpp    2024-01-27 14:37:30.242841158 +0100
@@ -446,6 +446,8 @@
     case lir_monaddr:        // input and result always valid, info always invalid
     case lir_null_check:     // input and info always valid, result always invalid
@@ -9601,9 +9605,9 @@
      // LIR_Op2
      case lir_cmp:                   s = "cmp";           break;
      case lir_cmp_l2i:               s = "cmp_l2i";       break;
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/c1/c1_LIR.hpp jdk-jdk-21-35/src/hotspot/share/c1/c1_LIR.hpp
--- jdk-jdk-21-35.orig/src/hotspot/share/c1/c1_LIR.hpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/c1/c1_LIR.hpp    2023-08-19 19:01:20.530893794 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/c1/c1_LIR.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/c1/c1_LIR.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/c1/c1_LIR.hpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/c1/c1_LIR.hpp    2024-01-27 14:37:30.243630237 +0100
@@ -939,6 +939,8 @@
       , lir_monaddr
       , lir_roundfp
@@ -9623,9 +9627,9 @@
   void null_check(LIR_Opr opr, CodeEmitInfo* info, bool deoptimize_on_null = false);
   void throw_exception(LIR_Opr exceptionPC, LIR_Opr exceptionOop, CodeEmitInfo* info) {
     append(new LIR_Op2(lir_throw, exceptionPC, exceptionOop, LIR_OprFact::illegalOpr, info));
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/cds/classListParser.cpp jdk-jdk-21-35/src/hotspot/share/cds/classListParser.cpp
--- jdk-jdk-21-35.orig/src/hotspot/share/cds/classListParser.cpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/cds/classListParser.cpp    2023-08-19 19:01:20.531566106 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/cds/classListParser.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/cds/classListParser.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/cds/classListParser.cpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/cds/classListParser.cpp    2024-01-27 14:37:30.244115606 +0100
@@ -452,7 +452,7 @@
 // This function is used for loading classes for customized class loaders
 // during archive dumping.
@@ -9635,9 +9639,9 @@
   // The only supported platforms are: (1) Linux/64-bit and (2) Solaris/64-bit and
   // (3) MacOSX/64-bit and (4) Windowss/64-bit
   // This #if condition should be in sync with the areCustomLoadersSupportedForCDS
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/runtime/abstract_vm_version.cpp jdk-jdk-21-35/src/hotspot/share/runtime/abstract_vm_version.cpp
--- jdk-jdk-21-35.orig/src/hotspot/share/runtime/abstract_vm_version.cpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/runtime/abstract_vm_version.cpp    2023-08-19 19:01:20.532273536 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/runtime/abstract_vm_version.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/runtime/abstract_vm_version.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/runtime/abstract_vm_version.cpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/runtime/abstract_vm_version.cpp    2024-01-27 14:37:30.244655390 +0100
@@ -167,6 +167,7 @@
 
 #define OS       LINUX_ONLY("linux")             \
@@ -9646,10 +9650,10 @@
                  AIX_ONLY("aix")                 \
                  BSD_ONLY("bsd")
 
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/runtime/globals.hpp jdk-jdk-21-35/src/hotspot/share/runtime/globals.hpp
--- jdk-jdk-21-35.orig/src/hotspot/share/runtime/globals.hpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/runtime/globals.hpp    2023-08-19 19:01:20.533699370 +0200
@@ -1593,8 +1593,10 @@
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/runtime/globals.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/runtime/globals.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/runtime/globals.hpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/runtime/globals.hpp    2024-01-27 14:37:30.245770044 +0100
@@ -1589,8 +1589,10 @@
   product(int, ThreadPriorityPolicy, 0,                                     \
           "0 : Normal.                                                     "\
           "    VM chooses priorities that are appropriate for normal       "\
@@ -9662,7 +9666,7 @@
           "    priorities. However, with ThreadPriorityPolicy=0, VM will   "\
           "    not use the highest possible native priority,               "\
           "    THREAD_PRIORITY_TIME_CRITICAL, as it may interfere with     "\
@@ -1876,7 +1878,8 @@
@@ -1872,7 +1874,8 @@
   product(bool, WhiteBoxAPI, false, DIAGNOSTIC,                             \
           "Enable internal testing APIs")                                   \
                                                                             \
@@ -9672,9 +9676,9 @@
           "Allocation less than this value will be allocated "              \
           "using malloc. Larger allocations will use mmap.")                \
                                                                             \
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/runtime/semaphore.hpp jdk-jdk-21-35/src/hotspot/share/runtime/semaphore.hpp
--- jdk-jdk-21-35.orig/src/hotspot/share/runtime/semaphore.hpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/runtime/semaphore.hpp    2023-08-19 19:01:20.534153026 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/runtime/semaphore.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/runtime/semaphore.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/runtime/semaphore.hpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/runtime/semaphore.hpp    2024-01-27 14:37:30.246111744 +0100
@@ -28,7 +28,7 @@
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -9684,9 +9688,9 @@
 # include "semaphore_posix.hpp"
 #else
 # include OS_HEADER(semaphore)
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/services/dtraceAttacher.cpp jdk-jdk-21-35/src/hotspot/share/services/dtraceAttacher.cpp
--- jdk-jdk-21-35.orig/src/hotspot/share/services/dtraceAttacher.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/hotspot/share/services/dtraceAttacher.cpp    2023-08-19 19:01:20.599559887 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/services/dtraceAttacher.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/services/dtraceAttacher.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/services/dtraceAttacher.cpp    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/services/dtraceAttacher.cpp    2024-01-27 14:37:30.295233484 +0100
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -9787,9 +9791,9 @@
+}
+
+#endif /* SOLARIS */
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/services/memTracker.cpp jdk-jdk-21-35/src/hotspot/share/services/memTracker.cpp
--- jdk-jdk-21-35.orig/src/hotspot/share/services/memTracker.cpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/services/memTracker.cpp    2023-08-19 19:01:20.534659952 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/services/memTracker.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/services/memTracker.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/services/memTracker.cpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/services/memTracker.cpp    2024-01-27 14:37:30.246500011 +0100
@@ -48,6 +48,12 @@
 #include <windows.h>
 #endif
@@ -9803,9 +9807,9 @@
 NMT_TrackingLevel MemTracker::_tracking_level = NMT_unknown;
 
 MemBaseline MemTracker::_baseline;
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/services/memTracker.hpp jdk-jdk-21-35/src/hotspot/share/services/memTracker.hpp
--- jdk-jdk-21-35.orig/src/hotspot/share/services/memTracker.hpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/services/memTracker.hpp    2023-08-19 19:01:20.535093570 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/services/memTracker.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/services/memTracker.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/services/memTracker.hpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/services/memTracker.hpp    2024-01-27 14:37:30.246851915 +0100
@@ -34,9 +34,11 @@
 #include "utilities/debug.hpp"
 #include "utilities/nativeCallStack.hpp"
@@ -9820,9 +9824,9 @@
                     NativeCallStack(1) : FAKE_CALLSTACK)
 
 class MemBaseline;
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/utilities/debug.cpp jdk-jdk-21-35/src/hotspot/share/utilities/debug.cpp
--- jdk-jdk-21-35.orig/src/hotspot/share/utilities/debug.cpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/utilities/debug.cpp    2023-08-19 19:01:20.535785758 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/debug.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/debug.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/debug.cpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/debug.cpp    2024-01-27 14:37:30.247391425 +0100
@@ -612,11 +612,12 @@
   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");
@@ -9837,9 +9841,9 @@
   tty->print_cr("                 - in gdb do 'set overload-resolution off' before calling pns()");
   tty->print_cr("                 - in dbx do 'frame 1' before calling pns()");
   tty->print_cr("class metadata.");
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/utilities/globalDefinitions_gcc.hpp jdk-jdk-21-35/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
--- jdk-jdk-21-35.orig/src/hotspot/share/utilities/globalDefinitions_gcc.hpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/utilities/globalDefinitions_gcc.hpp    2023-08-19 19:01:20.536370195 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/globalDefinitions_gcc.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/globalDefinitions_gcc.hpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/globalDefinitions_gcc.hpp    2024-01-27 14:37:30.247888940 +0100
@@ -39,15 +39,36 @@
 #include <stdlib.h>
 #include <wchar.h>
@@ -9966,9 +9970,9 @@
 inline int g_isnan(double f) { return isnan(f); }
 #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
 inline int g_isnan(float  f) { return isnan(f); }
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/utilities/macros.hpp jdk-jdk-21-35/src/hotspot/share/utilities/macros.hpp
--- jdk-jdk-21-35.orig/src/hotspot/share/utilities/macros.hpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/utilities/macros.hpp    2023-08-19 19:01:20.536866370 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/macros.hpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/macros.hpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/macros.hpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/macros.hpp    2024-01-27 14:37:30.248271340 +0100
@@ -401,6 +401,14 @@
 #define NOT_AIX(code) code
 #endif
@@ -9984,9 +9988,9 @@
 #ifdef _WINDOWS
 #define WINDOWS_ONLY(code) code
 #define NOT_WINDOWS(code)
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/utilities/ostream.cpp jdk-jdk-21-35/src/hotspot/share/utilities/ostream.cpp
--- jdk-jdk-21-35.orig/src/hotspot/share/utilities/ostream.cpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/utilities/ostream.cpp    2023-08-19 19:01:20.537480903 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/ostream.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/ostream.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/ostream.cpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/ostream.cpp    2024-01-27 14:37:30.248745539 +0100
@@ -1082,7 +1082,7 @@
 
 #ifndef PRODUCT
@@ -9996,19 +10000,10 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff -Nru jdk-jdk-21-35.orig/src/hotspot/share/utilities/vmError.cpp jdk-jdk-21-35/src/hotspot/share/utilities/vmError.cpp
--- jdk-jdk-21-35.orig/src/hotspot/share/utilities/vmError.cpp    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/hotspot/share/utilities/vmError.cpp    2023-08-19 19:01:20.538368699 +0200
@@ -106,7 +106,7 @@
   "JAVA_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
   "PATH", "USERNAME",
 
-  // Env variables that are defined on Linux/BSD
+  // Env variables that are defined on Solaris/Linux/BSD
   "LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY",
   "HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE",
   "LANG", "LC_ALL", "LC_CTYPE", "LC_NUMERIC", "LC_TIME",
@@ -1865,6 +1865,8 @@
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/vmError.cpp jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/vmError.cpp
--- jdk21u-jdk-21.0.2-ga.orig/src/hotspot/share/utilities/vmError.cpp    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/hotspot/share/utilities/vmError.cpp    2024-01-27 14:37:30.249427159 +0100
@@ -1888,6 +1888,8 @@
       out.print_raw   ("#   Executing ");
 #if defined(LINUX) || defined(_ALLBSD_SOURCE)
       out.print_raw   ("/bin/sh -c ");
@@ -10017,7 +10012,7 @@
 #elif defined(_WINDOWS)
       out.print_raw   ("cmd /C ");
 #endif
@@ -1929,6 +1931,8 @@
@@ -1952,6 +1954,8 @@
     tty->print("#   Executing ");
 #if defined(LINUX)
     tty->print  ("/bin/sh -c ");
@@ -10026,9 +10021,9 @@
 #endif
     tty->print_cr("\"%s\"...", cmd);
 
diff -Nru jdk-jdk-21-35.orig/src/java.base/share/classes/sun/net/sdp/SdpSupport.java jdk-jdk-21-35/src/java.base/share/classes/sun/net/sdp/SdpSupport.java
--- jdk-jdk-21-35.orig/src/java.base/share/classes/sun/net/sdp/SdpSupport.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/share/classes/sun/net/sdp/SdpSupport.java    2023-08-19 19:01:20.538966942 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/classes/sun/net/sdp/SdpSupport.java jdk21u-jdk-21.0.2-ga/src/java.base/share/classes/sun/net/sdp/SdpSupport.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/classes/sun/net/sdp/SdpSupport.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/share/classes/sun/net/sdp/SdpSupport.java    2024-01-27 14:37:30.249795290 +0100
@@ -39,7 +39,7 @@
  */
 
@@ -10038,9 +10033,9 @@
     private static final JavaIOFileDescriptorAccess fdAccess =
         SharedSecrets.getJavaIOFileDescriptorAccess();
 
diff -Nru jdk-jdk-21-35.orig/src/java.base/share/classes/sun/nio/ch/Net.java jdk-jdk-21-35/src/java.base/share/classes/sun/nio/ch/Net.java
--- jdk-jdk-21-35.orig/src/java.base/share/classes/sun/nio/ch/Net.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/share/classes/sun/nio/ch/Net.java    2023-08-19 19:01:20.539616659 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/classes/sun/nio/ch/Net.java jdk21u-jdk-21.0.2-ga/src/java.base/share/classes/sun/nio/ch/Net.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/classes/sun/nio/ch/Net.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/share/classes/sun/nio/ch/Net.java    2024-01-27 14:37:30.250279871 +0100
@@ -512,7 +512,7 @@
     private static native boolean isReusePortAvailable0();
 
@@ -10050,9 +10045,9 @@
      */
     private static native int isExclusiveBindAvailable();
 
diff -Nru jdk-jdk-21-35.orig/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template jdk-jdk-21-35/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
--- jdk-jdk-21-35.orig/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template    2023-08-19 19:01:20.540116026 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template jdk21u-jdk-21.0.2-ga/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template    2024-01-27 14:37:30.250690953 +0100
@@ -43,6 +43,8 @@
 #define SO_REUSEPORT 0
 #elif defined(__linux__)
@@ -10073,9 +10068,9 @@
 /* To be able to name the Java constants the same as the C constants without
    having the preprocessor rewrite those identifiers, add PREFIX_ to all
    identifiers matching a C constant. The PREFIX_ is filtered out in the
diff -Nru jdk-jdk-21-35.orig/src/java.base/share/conf/security/java.security jdk-jdk-21-35/src/java.base/share/conf/security/java.security
--- jdk-jdk-21-35.orig/src/java.base/share/conf/security/java.security    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/share/conf/security/java.security    2023-08-19 19:01:20.540980609 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/conf/security/java.security jdk21u-jdk-21.0.2-ga/src/java.base/share/conf/security/java.security
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/conf/security/java.security    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/share/conf/security/java.security    2024-01-27 14:37:30.251346073 +0100
@@ -66,6 +66,9 @@
 #
 # List of providers and their preference orders (see above):
@@ -10096,9 +10091,9 @@
 
 #
 # A list of preferred providers for specific algorithms. These providers will
diff -Nru jdk-jdk-21-35.orig/src/java.base/share/native/libjli/jli_util.h jdk-jdk-21-35/src/java.base/share/native/libjli/jli_util.h
--- jdk-jdk-21-35.orig/src/java.base/share/native/libjli/jli_util.h    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/share/native/libjli/jli_util.h    2023-08-19 19:01:20.541473783 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/native/libjli/jli_util.h jdk21u-jdk-21.0.2-ga/src/java.base/share/native/libjli/jli_util.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/native/libjli/jli_util.h    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/share/native/libjli/jli_util.h    2024-01-27 14:37:30.251714179 +0100
@@ -100,6 +100,9 @@
 #define JLI_StrCaseCmp(p1, p2)          strcasecmp((p1), (p2))
 #define JLI_StrNCaseCmp(p1, p2, p3)     strncasecmp((p1), (p2), (p3))
@@ -10109,9 +10104,9 @@
 #ifdef __linux__
 #define _LARGFILE64_SOURCE
 #define JLI_Lseek                       lseek64
diff -Nru jdk-jdk-21-35.orig/src/java.base/share/native/libnet/net_util.c jdk-jdk-21-35/src/java.base/share/native/libnet/net_util.c
--- jdk-jdk-21-35.orig/src/java.base/share/native/libnet/net_util.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/share/native/libnet/net_util.c    2023-08-19 19:01:20.541960530 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/native/libnet/net_util.c jdk21u-jdk-21.0.2-ga/src/java.base/share/native/libnet/net_util.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/native/libnet/net_util.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/share/native/libnet/net_util.c    2024-01-27 14:37:30.252105372 +0100
@@ -81,6 +81,7 @@
 
     /* check if SO_REUSEPORT is supported on this platform */
@@ -10120,9 +10115,9 @@
 
     return JNI_VERSION_1_2;
 }
diff -Nru jdk-jdk-21-35.orig/src/java.base/share/native/libnet/net_util.h jdk-jdk-21-35/src/java.base/share/native/libnet/net_util.h
--- jdk-jdk-21-35.orig/src/java.base/share/native/libnet/net_util.h    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/share/native/libnet/net_util.h    2023-08-19 19:01:20.542379679 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/native/libnet/net_util.h jdk21u-jdk-21.0.2-ga/src/java.base/share/native/libnet/net_util.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/share/native/libnet/net_util.h    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/share/native/libnet/net_util.h    2024-01-27 14:37:30.252441788 +0100
@@ -142,6 +142,8 @@
 JNIEXPORT jobject JNICALL
 NET_SockaddrToInetAddress(JNIEnv *env, SOCKETADDRESS *sa, int *port);
@@ -10132,9 +10127,9 @@
 JNIEXPORT jint JNICALL NET_GetPortFromSockaddr(SOCKETADDRESS *sa);
 
 JNIEXPORT jboolean JNICALL
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java    2023-08-19 19:01:20.600142634 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java    2024-01-27 14:37:30.295677731 +0100
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
@@ -10183,9 +10178,9 @@
+        return new SolarisAsynchronousChannelProvider();
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java    2023-08-19 19:01:20.600491435 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java    2024-01-27 14:37:30.295939064 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -10241,9 +10236,9 @@
+        return INSTANCE;
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java    2023-08-19 19:01:20.600859978 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java    2024-01-27 14:37:30.296221915 +0100
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -10372,9 +10367,9 @@
+        IOUtil.load();
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java    2023-08-19 19:01:20.601290154 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java    2024-01-27 14:37:30.296558857 +0100
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -10639,9 +10634,9 @@
+        }
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java    2023-08-19 19:01:20.601616037 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorProvider.java    2024-01-27 14:37:30.296808178 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -10685,9 +10680,9 @@
+        return InheritedChannel.getChannel();
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java    2023-08-19 19:01:20.602261091 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java    2024-01-27 14:37:30.297313272 +0100
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -10997,9 +10992,9 @@
+        return (int) pollArray.getLong(offset);
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java    2023-08-19 19:01:20.602586911 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java    2024-01-27 14:37:30.297600057 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
@@ -11043,9 +11038,9 @@
+        return InheritedChannel.getChannel();
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java    2023-08-19 19:01:20.602955543 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java    2024-01-27 14:37:30.297888807 +0100
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -11140,9 +11135,9 @@
+        return new UnixAsynchronousSocketChannelImpl(toEventPort(group));
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java    2023-08-19 19:01:20.603403043 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java    2024-01-27 14:37:30.298263681 +0100
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
@@ -11412,9 +11407,9 @@
+        IOUtil.load();
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java    2023-08-19 19:01:20.603816638 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java    2024-01-27 14:37:30.298589379 +0100
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -11469,9 +11464,9 @@
+        return INSTANCE.theFileSystem();
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java    2023-08-19 19:01:20.604356147 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java    2024-01-27 14:37:30.299013273 +0100
@@ -0,0 +1,414 @@
+/*
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -11887,9 +11882,9 @@
+        }
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template    2023-08-19 19:01:20.604722484 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template    2024-01-27 14:37:30.299291815 +0100
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
@@ -11980,9 +11975,9 @@
+    static final int PREFIX_ACE_GROUP = ACE_GROUP;
+    static final int PREFIX_ACE_EVERYONE = ACE_EVERYONE;
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java    2023-08-19 19:01:20.605080447 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisFileStore.java    2024-01-27 14:37:30.299568430 +0100
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -12095,9 +12090,9 @@
+        return super.supportsFileAttributeView(name);
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java    2023-08-19 19:01:20.605448656 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystem.java    2024-01-27 14:37:30.299856468 +0100
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -12226,9 +12221,9 @@
+        return new SolarisFileStore(this, entry);
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java    2023-08-19 19:01:20.605805473 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java    2024-01-27 14:37:30.300150586 +0100
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -12324,9 +12319,9 @@
+                     new MimeTypesFileTypeDetector(etcMimeTypes));
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java    2023-08-19 19:01:20.606135884 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java    2024-01-27 14:37:30.300409159 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -12383,9 +12378,9 @@
+        init();
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java    2023-08-19 19:01:20.606449071 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java    2024-01-27 14:37:30.300676746 +0100
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -12428,9 +12423,9 @@
+    }
+
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java
--- jdk-jdk-21-35.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java    2023-08-19 19:01:20.607061001 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java    2024-01-27 14:37:30.301262890 +0100
@@ -0,0 +1,821 @@
+/*
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -13253,9 +13248,9 @@
+        init();
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c jdk-jdk-21-35/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c    2023-08-19 19:01:20.607419340 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjava/ProcessHandleImpl_solaris.c    2024-01-27 14:37:30.301597886 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -13308,9 +13303,9 @@
+    unix_getCmdlineAndUserInfo(env, jinfo, pid);
+}
+
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libjvm_db/libjvm_db.c jdk-jdk-21-35/src/java.base/solaris/native/libjvm_db/libjvm_db.c
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libjvm_db/libjvm_db.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libjvm_db/libjvm_db.c    2023-08-19 19:01:20.608383707 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjvm_db/libjvm_db.c jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjvm_db/libjvm_db.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjvm_db/libjvm_db.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjvm_db/libjvm_db.c    2024-01-27 14:37:30.302559094 +0100
@@ -0,0 +1,1552 @@
+/*
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -14864,9 +14859,9 @@
+    update_gregs(gregs, jframe);
+    return (0);
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libjvm_db/libjvm_db.h jdk-jdk-21-35/src/java.base/solaris/native/libjvm_db/libjvm_db.h
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libjvm_db/libjvm_db.h    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libjvm_db/libjvm_db.h    2023-08-19 19:01:20.608671675 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjvm_db/libjvm_db.h jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjvm_db/libjvm_db.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjvm_db/libjvm_db.h    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjvm_db/libjvm_db.h    2024-01-27 14:37:30.302820832 +0100
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -14937,9 +14932,9 @@
+#endif /* __cplusplus */
+
+#endif // OS_SOLARIS_DTRACE_LIBJVM_DB_H
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c jdk-jdk-21-35/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c    2023-08-19 19:01:20.609197147 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c    2024-01-27 14:37:30.303346224 +0100
@@ -0,0 +1,562 @@
+/*
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -15503,9 +15498,9 @@
+    clear_jvm_error();
+    return count;
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h jdk-jdk-21-35/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h    2023-08-19 19:01:20.609471133 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h    2024-01-27 14:37:30.303623011 +0100
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -15593,9 +15588,9 @@
+#endif
+
+#endif /* _JVM_DTRACE_H_ */
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libnet/solaris_close.c jdk-jdk-21-35/src/java.base/solaris/native/libnet/solaris_close.c
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libnet/solaris_close.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libnet/solaris_close.c    2023-08-19 19:01:20.609812963 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnet/solaris_close.c jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnet/solaris_close.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnet/solaris_close.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnet/solaris_close.c    2024-01-27 14:37:30.303944537 +0100
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -15704,9 +15699,9 @@
+        }
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c jdk-jdk-21-35/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c    2023-08-19 19:01:20.610192597 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c    2024-01-27 14:37:30.304307768 +0100
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -15820,9 +15815,9 @@
+    }
+    return result;
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c jdk-jdk-21-35/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c    2023-08-19 19:01:20.610500133 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnio/ch/SolarisEventPort.c    2024-01-27 14:37:30.304588678 +0100
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -15971,9 +15966,9 @@
+
+    return (jint)n;
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c jdk-jdk-21-35/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c    2023-08-19 19:01:20.610856794 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnio/fs/SolarisNativeDispatcher.c    2024-01-27 14:37:30.304948430 +0100
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -16118,9 +16113,9 @@
+
+    return 0;
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c jdk-jdk-21-35/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c
--- jdk-jdk-21-35.orig/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c    2023-08-19 19:01:20.611132038 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/solaris/native/libnio/fs/SolarisWatchService.c    2024-01-27 14:37:30.305216729 +0100
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -16226,9 +16221,9 @@
+    }
+    return (jint)n;
+}
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/classes/java/lang/ProcessImpl.java jdk-jdk-21-35/src/java.base/unix/classes/java/lang/ProcessImpl.java
--- jdk-jdk-21-35.orig/src/java.base/unix/classes/java/lang/ProcessImpl.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/classes/java/lang/ProcessImpl.java    2023-08-19 19:01:20.543205298 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/java/lang/ProcessImpl.java jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/java/lang/ProcessImpl.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/java/lang/ProcessImpl.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/java/lang/ProcessImpl.java    2024-01-27 14:37:30.253043033 +0100
@@ -83,6 +83,9 @@
     private /* final */ InputStream  stdout;
     private /* final */ InputStream  stderr;
@@ -16319,9 +16314,9 @@
             default: throw new AssertionError("Unsupported platform: " + OperatingSystem.current());
         }
     }
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/net/PortConfig.java jdk-jdk-21-35/src/java.base/unix/classes/sun/net/PortConfig.java
--- jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/net/PortConfig.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/classes/sun/net/PortConfig.java    2023-08-19 19:01:20.543673861 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/net/PortConfig.java jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/net/PortConfig.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/net/PortConfig.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/net/PortConfig.java    2024-01-27 14:37:30.253377354 +0100
@@ -47,6 +47,10 @@
                 defaultLower = 32768;
                 defaultUpper = 61000;
@@ -16333,9 +16328,9 @@
             case MACOS:
                 defaultLower = 49152;
                 defaultUpper = 65535;
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template jdk-jdk-21-35/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
--- jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template    2023-08-19 19:01:20.544172813 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template    2024-01-27 14:37:30.253736087 +0100
@@ -35,6 +35,10 @@
 #include <sys/clonefile.h>
 #endif
@@ -16347,9 +16342,9 @@
 /* To be able to name the Java constants the same as the C constants without
    having the preprocessor rewrite those identifiers, add PREFIX_ to all
    identifiers matching a C constant. The PREFIX_ is filtered out in the
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java jdk-jdk-21-35/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
--- jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java    2023-08-19 19:01:20.544772380 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java    2024-01-27 14:37:30.254220531 +0100
@@ -127,6 +127,10 @@
         return rootDirectory;
     }
@@ -16361,9 +16356,9 @@
     static List<String> standardFileAttributeViews() {
         return Arrays.asList("basic", "posix", "unix", "owner");
     }
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/nio/fs/UnixPath.java jdk-jdk-21-35/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
--- jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/nio/fs/UnixPath.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/classes/sun/nio/fs/UnixPath.java    2023-08-19 19:01:20.545373681 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/nio/fs/UnixPath.java jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/nio/fs/UnixPath.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/nio/fs/UnixPath.java    2024-01-27 14:37:30.254656609 +0100
@@ -779,7 +779,15 @@
                     ("NOFOLLOW_LINKS is not supported on this platform");
             flags |= O_NOFOLLOW;
@@ -16381,9 +16376,9 @@
     }
 
     void checkRead() {
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/security/provider/NativePRNG.java jdk-jdk-21-35/src/java.base/unix/classes/sun/security/provider/NativePRNG.java
--- jdk-jdk-21-35.orig/src/java.base/unix/classes/sun/security/provider/NativePRNG.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/classes/sun/security/provider/NativePRNG.java    2023-08-19 19:01:20.545964408 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/security/provider/NativePRNG.java jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/security/provider/NativePRNG.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/classes/sun/security/provider/NativePRNG.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/classes/sun/security/provider/NativePRNG.java    2024-01-27 14:37:30.255118398 +0100
@@ -33,7 +33,7 @@
 import sun.security.util.Debug;
 
@@ -16393,9 +16388,9 @@
  * <p>
  * It obtains seed and random numbers by reading system files such as
  * the special device files /dev/random and /dev/urandom.  This
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/io_util_md.c jdk-jdk-21-35/src/java.base/unix/native/libjava/io_util_md.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/io_util_md.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libjava/io_util_md.c    2023-08-19 19:01:20.549728945 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/io_util_md.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/io_util_md.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/io_util_md.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/io_util_md.c    2024-01-27 14:37:30.258040069 +0100
@@ -30,6 +30,10 @@
 #include <string.h>
 #include <unistd.h>
@@ -16407,10 +16402,10 @@
 #if defined(__linux__) || defined(_ALLBSD_SOURCE) || defined(_AIX)
 #include <sys/ioctl.h>
 #endif
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/java_props_md.c jdk-jdk-21-35/src/java.base/unix/native/libjava/java_props_md.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/java_props_md.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libjava/java_props_md.c    2023-08-19 19:01:20.550230005 +0200
@@ -313,6 +313,27 @@
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/java_props_md.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/java_props_md.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/java_props_md.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/java_props_md.c    2024-01-27 14:37:30.258500184 +0100
@@ -323,6 +323,27 @@
         }
 #endif
 
@@ -16438,9 +16433,9 @@
 #ifdef MACOSX
         /*
          * For the case on MacOS X where encoding is set to US-ASCII, but we
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/jlong_md.h jdk-jdk-21-35/src/java.base/unix/native/libjava/jlong_md.h
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/jlong_md.h    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libjava/jlong_md.h    2023-08-19 19:01:20.550684517 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/jlong_md.h jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/jlong_md.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/jlong_md.h    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/jlong_md.h    2024-01-27 14:37:30.258843076 +0100
@@ -23,8 +23,8 @@
  * questions.
  */
@@ -16458,9 +16453,9 @@
 
-#endif /* !_UNIX_JLONG_MD_H_ */
+#endif /* !_SOLARIS_JLONG_MD_H_ */
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c jdk-jdk-21-35/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c    2023-08-19 19:01:20.546846260 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c    2024-01-27 14:37:30.255775692 +0100
@@ -45,10 +45,20 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -16504,20 +16499,20 @@
 #define RESTARTABLE(_cmd, _result) do { \
   do { \
@@ -488,7 +503,7 @@
  * The following functions are common on Solaris, Linux and AIX.
  * The following functions are for Linux
  */
 
-#if defined (__linux__) || defined(_AIX)
+#if defined(__solaris__) || defined (__linux__) || defined(_AIX)
-#if defined (__linux__)
+#if defined(__solaris__) || defined (__linux__)
 
 /*
  * Returns the children of the requested pid and optionally each parent and
@@ -607,13 +622,13 @@
  * Return pids of active processes, and optionally parent pids and
@@ -617,13 +632,13 @@
     return count;
 }
 
-#endif // defined (__linux__) || defined(_AIX)
+#endif // defined(__solaris__) || defined (__linux__) || defined(_AIX)
-#endif // defined (__linux__)
+#endif // defined(__solaris__) || defined (__linux__)
 
 /*
- * The following functions are for AIX.
@@ -16529,7 +16524,7 @@
 
 /**
  * Helper function to get the 'psinfo_t' data from "/proc/%d/psinfo".
@@ -677,6 +692,19 @@
@@ -687,6 +702,19 @@
     int ret;
 
     /*
@@ -16549,15 +16544,15 @@
      * Now try to open /proc/%d/psinfo
      */
     if (getPsinfo(pid, &psinfo) < 0) {
@@ -705,4 +733,4 @@
@@ -715,4 +743,4 @@
                       prargs[0] == '\0' ? NULL : prargs);
 }
 
-#endif // defined(_AIX)
+#endif // defined(__solaris__) || defined(_AIX)
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h jdk-jdk-21-35/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h    2023-08-19 19:01:20.547259894 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.h    2024-01-27 14:37:30.256084125 +0100
@@ -29,7 +29,7 @@
  * Declaration of ProcessHandleImpl functions common on all Unix platforms.
  * 'unix_' functions have a single implementation in ProcessHandleImpl_unix.c
@@ -16567,9 +16562,9 @@
  * See ProcessHandleImpl_unix.c for more details.
  */
 
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/ProcessImpl_md.c jdk-jdk-21-35/src/java.base/unix/native/libjava/ProcessImpl_md.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/ProcessImpl_md.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libjava/ProcessImpl_md.c    2023-08-19 19:01:20.547923675 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/ProcessImpl_md.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/ProcessImpl_md.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/ProcessImpl_md.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/ProcessImpl_md.c    2024-01-27 14:37:30.256599288 +0100
@@ -230,7 +230,14 @@
 static const char*
 defaultPath(void)
@@ -16604,9 +16599,9 @@
       case MODE_VFORK:
         return vforkChild(c);
       #endif
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/TimeZone_md.c jdk-jdk-21-35/src/java.base/unix/native/libjava/TimeZone_md.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/TimeZone_md.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libjava/TimeZone_md.c    2023-08-19 19:01:20.548802085 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/TimeZone_md.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/TimeZone_md.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/TimeZone_md.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/TimeZone_md.c    2024-01-27 14:37:30.257292853 +0100
@@ -35,6 +35,9 @@
 #include <string.h>
 #include <dirent.h>
@@ -16861,9 +16856,9 @@
         if (freetz == NULL) {
             /* strdup if we are still working on getenv result. */
             javatz = strdup(tz);
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/UnixFileSystem_md.c jdk-jdk-21-35/src/java.base/unix/native/libjava/UnixFileSystem_md.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libjava/UnixFileSystem_md.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libjava/UnixFileSystem_md.c    2023-08-19 19:01:20.549284667 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/UnixFileSystem_md.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/UnixFileSystem_md.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjava/UnixFileSystem_md.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjava/UnixFileSystem_md.c    2024-01-27 14:37:30.257692274 +0100
@@ -63,6 +63,10 @@
   #define stat stat64
 #endif
@@ -16875,9 +16870,9 @@
 #if defined(_ALLBSD_SOURCE)
   #ifndef MACOSX
     #define statvfs64 statvfs
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libjsig/jsig.c jdk-jdk-21-35/src/java.base/unix/native/libjsig/jsig.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libjsig/jsig.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libjsig/jsig.c    2023-08-19 19:01:20.551562547 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjsig/jsig.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjsig/jsig.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libjsig/jsig.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libjsig/jsig.c    2024-01-27 14:37:30.259491369 +0100
@@ -35,6 +35,16 @@
 
 #include "jni.h"
@@ -16991,9 +16986,9 @@
   /* Does race condition make sense here? */
   if (sigismember(&jvmsigs, sig)) {
     return &sact[sig];
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/Inet4AddressImpl.c jdk-jdk-21-35/src/java.base/unix/native/libnet/Inet4AddressImpl.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/Inet4AddressImpl.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnet/Inet4AddressImpl.c    2023-08-19 19:01:20.552118734 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/Inet4AddressImpl.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/Inet4AddressImpl.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/Inet4AddressImpl.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/Inet4AddressImpl.c    2024-01-27 14:37:30.259894450 +0100
@@ -66,8 +66,27 @@
     if (gethostname(hostname, sizeof(hostname)) != 0) {
         strcpy(hostname, "localhost");
@@ -17022,9 +17017,9 @@
     }
     return (*env)->NewStringUTF(env, hostname);
 }
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/Inet6AddressImpl.c jdk-jdk-21-35/src/java.base/unix/native/libnet/Inet6AddressImpl.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/Inet6AddressImpl.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnet/Inet6AddressImpl.c    2023-08-19 19:01:20.552698215 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/Inet6AddressImpl.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/Inet6AddressImpl.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/Inet6AddressImpl.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/Inet6AddressImpl.c    2024-01-27 14:37:30.260314595 +0100
@@ -67,8 +67,27 @@
     if (gethostname(hostname, sizeof(hostname)) != 0) {
         strcpy(hostname, "localhost");
@@ -17053,9 +17048,9 @@
     }
     return (*env)->NewStringUTF(env, hostname);
 }
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/net_util_md.c jdk-jdk-21-35/src/java.base/unix/native/libnet/net_util_md.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/net_util_md.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnet/net_util_md.c    2023-08-19 19:01:20.555300093 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/net_util_md.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/net_util_md.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/net_util_md.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/net_util_md.c    2024-01-27 14:37:30.262387096 +0100
@@ -37,6 +37,14 @@
 #include <sys/utsname.h>
 #endif
@@ -17423,9 +17418,9 @@
     return rv;
 }
 
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/net_util_md.h jdk-jdk-21-35/src/java.base/unix/native/libnet/net_util_md.h
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/net_util_md.h    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnet/net_util_md.h    2023-08-19 19:01:20.555792542 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/net_util_md.h jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/net_util_md.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/net_util_md.h    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/net_util_md.h    2024-01-27 14:37:30.262728792 +0100
@@ -47,6 +47,8 @@
 #ifndef SO_REUSEPORT
 #ifdef __linux__
@@ -17444,9 +17439,9 @@
+#endif
+
 #endif /* NET_UTILS_MD_H */
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/NetworkInterface.c jdk-jdk-21-35/src/java.base/unix/native/libnet/NetworkInterface.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/NetworkInterface.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnet/NetworkInterface.c    2023-08-19 19:01:20.553759676 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/NetworkInterface.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/NetworkInterface.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/NetworkInterface.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/NetworkInterface.c    2024-01-27 14:37:30.261178404 +0100
@@ -37,6 +37,12 @@
 #include <strings.h>
 #endif
@@ -17857,9 +17852,9 @@
 /** BSD **/
 #if defined(_ALLBSD_SOURCE)
 
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/portconfig.c jdk-jdk-21-35/src/java.base/unix/native/libnet/portconfig.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/portconfig.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnet/portconfig.c    2023-08-19 19:01:20.556229429 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/portconfig.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/portconfig.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/portconfig.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/portconfig.c    2024-01-27 14:37:30.263031299 +0100
@@ -60,6 +60,13 @@
         }
         return -1;
@@ -17874,9 +17869,9 @@
 #elif defined(_ALLBSD_SOURCE)
     {
         int ret;
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/SdpSupport.c jdk-jdk-21-35/src/java.base/unix/native/libnet/SdpSupport.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnet/SdpSupport.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnet/SdpSupport.c    2023-08-19 19:01:20.554258272 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/SdpSupport.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/SdpSupport.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnet/SdpSupport.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnet/SdpSupport.c    2024-01-27 14:37:30.261579994 +0100
@@ -27,7 +27,11 @@
 #include <sys/socket.h>
 #include <errno.h>
@@ -17902,9 +17897,9 @@
     /**
      * IPv6 not supported by SDP on Linux
      */
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c jdk-jdk-21-35/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c    2023-08-19 19:01:20.556757458 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c    2024-01-27 14:37:30.263465003 +0100
@@ -50,6 +50,9 @@
     jint fd = fdval(env, fdo);
     int rv;
@@ -17924,9 +17919,9 @@
     if (rv < 0)
         handleSocketError(env, errno);
 }
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/ch/NativeThread.c jdk-jdk-21-35/src/java.base/unix/native/libnio/ch/NativeThread.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/ch/NativeThread.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnio/ch/NativeThread.c    2023-08-19 19:01:20.557219974 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/ch/NativeThread.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/ch/NativeThread.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/ch/NativeThread.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/ch/NativeThread.c    2024-01-27 14:37:30.263835074 +0100
@@ -40,6 +40,9 @@
 #elif defined(_AIX)
   /* Also defined in net/aix_close.c */
@@ -17960,9 +17955,9 @@
 #ifdef MACOSX
     if (ret != 0 && ret != ESRCH)
 #else
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/ch/Net.c jdk-jdk-21-35/src/java.base/unix/native/libnio/ch/Net.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/ch/Net.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnio/ch/Net.c    2023-08-19 19:01:20.557850247 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/ch/Net.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/ch/Net.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/ch/Net.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/ch/Net.c    2024-01-27 14:37:30.264317558 +0100
@@ -215,7 +215,7 @@
 JNIEXPORT jboolean JNICALL
 Java_sun_nio_ch_Net_canIPv6SocketJoinIPv4Group0(JNIEnv* env, jclass cl)
@@ -17981,9 +17976,9 @@
     /* IPV6_ADD_MEMBERSHIP can be used to join IPv4 multicast groups */
     return JNI_TRUE;
 #else
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/ch/nio_util.h jdk-jdk-21-35/src/java.base/unix/native/libnio/ch/nio_util.h
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/ch/nio_util.h    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnio/ch/nio_util.h    2023-08-19 19:01:20.558250289 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/ch/nio_util.h jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/ch/nio_util.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/ch/nio_util.h    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/ch/nio_util.h    2024-01-27 14:37:30.264654438 +0100
@@ -41,6 +41,8 @@
 #ifndef SO_REUSEPORT
 #ifdef __linux__
@@ -17993,9 +17988,9 @@
 #elif defined(AIX) || defined(MACOSX)
 #define SO_REUSEPORT 0x0200
 #else
diff -Nru jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c jdk-jdk-21-35/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
--- jdk-jdk-21-35.orig/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c    2023-08-19 19:01:20.558969053 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c    2024-01-27 14:37:30.265241690 +0100
@@ -45,10 +45,17 @@
 #include <sys/xattr.h>
 #endif
@@ -18014,8 +18009,8 @@
+
 #ifdef __linux__
 #include <sys/syscall.h>
 #endif
@@ -260,7 +267,8 @@
 #include <sys/sysmacros.h> // makedev macros
@@ -374,7 +381,8 @@
 
     /* system calls that might not be available at run time */
 
@@ -18025,9 +18020,9 @@
     my_openat64_func = (openat64_func*)dlsym(RTLD_DEFAULT, "openat");
     my_fstatat64_func = (fstatat64_func*)dlsym(RTLD_DEFAULT, "fstatat");
 #else
diff -Nru jdk-jdk-21-35.orig/src/java.base/windows/native/libnet/net_util_md.c jdk-jdk-21-35/src/java.base/windows/native/libnet/net_util_md.c
--- jdk-jdk-21-35.orig/src/java.base/windows/native/libnet/net_util_md.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.base/windows/native/libnet/net_util_md.c    2023-08-19 19:01:20.559579706 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.base/windows/native/libnet/net_util_md.c jdk21u-jdk-21.0.2-ga/src/java.base/windows/native/libnet/net_util_md.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.base/windows/native/libnet/net_util_md.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.base/windows/native/libnet/net_util_md.c    2024-01-27 14:37:30.265681808 +0100
@@ -125,6 +125,8 @@
     }
     return TRUE;
@@ -18037,9 +18032,9 @@
 
 /*
  * Since winsock doesn't have the equivalent of strerror(errno)
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/share/classes/sun/awt/FontConfiguration.java jdk-jdk-21-35/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
--- jdk-jdk-21-35.orig/src/java.desktop/share/classes/sun/awt/FontConfiguration.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/share/classes/sun/awt/FontConfiguration.java    2023-08-19 19:01:20.560707392 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/share/classes/sun/awt/FontConfiguration.java jdk21u-jdk-21.0.2-ga/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/share/classes/sun/awt/FontConfiguration.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/share/classes/sun/awt/FontConfiguration.java    2024-01-27 14:37:30.266545982 +0100
@@ -1422,6 +1422,22 @@
                 }
             }
@@ -18063,9 +18058,9 @@
         if (errors != 0) {
             System.err.println("!!THERE ARE " + errors + " ERROR(S) IN "
                                + "THE FONTCONFIG FILE, PLEASE CHECK ITS CONTENT!!\n");
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/share/classes/sun/awt/OSInfo.java jdk-jdk-21-35/src/java.desktop/share/classes/sun/awt/OSInfo.java
--- jdk-jdk-21-35.orig/src/java.desktop/share/classes/sun/awt/OSInfo.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/share/classes/sun/awt/OSInfo.java    2023-08-19 19:01:20.561212115 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/share/classes/sun/awt/OSInfo.java jdk21u-jdk-21.0.2-ga/src/java.desktop/share/classes/sun/awt/OSInfo.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/share/classes/sun/awt/OSInfo.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/share/classes/sun/awt/OSInfo.java    2024-01-27 14:37:30.266914895 +0100
@@ -39,6 +39,7 @@
     public static enum OSType {
         WINDOWS,
@@ -18082,9 +18077,9 @@
             case MACOS -> MACOSX;
             case AIX -> AIX;
             default -> UNKNOWN;
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/share/classes/sun/font/FontUtilities.java jdk-jdk-21-35/src/java.desktop/share/classes/sun/font/FontUtilities.java
--- jdk-jdk-21-35.orig/src/java.desktop/share/classes/sun/font/FontUtilities.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/share/classes/sun/font/FontUtilities.java    2023-08-19 19:01:20.561899667 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/share/classes/sun/font/FontUtilities.java jdk21u-jdk-21.0.2-ga/src/java.desktop/share/classes/sun/font/FontUtilities.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/share/classes/sun/font/FontUtilities.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/share/classes/sun/font/FontUtilities.java    2024-01-27 14:37:30.267416410 +0100
@@ -41,6 +41,8 @@
  */
 public final class FontUtilities {
@@ -18103,9 +18098,9 @@
                 isLinux = OSInfo.getOSType() == OSInfo.OSType.LINUX;
 
                 isMacOSX = OSInfo.getOSType() == OSInfo.OSType.MACOSX;
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/share/native/libjsound/SoundDefs.h jdk-jdk-21-35/src/java.desktop/share/native/libjsound/SoundDefs.h
--- jdk-jdk-21-35.orig/src/java.desktop/share/native/libjsound/SoundDefs.h    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/share/native/libjsound/SoundDefs.h    2023-08-19 19:01:20.562498634 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/share/native/libjsound/SoundDefs.h jdk21u-jdk-21.0.2-ga/src/java.desktop/share/native/libjsound/SoundDefs.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/share/native/libjsound/SoundDefs.h    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/share/native/libjsound/SoundDefs.h    2024-01-27 14:37:30.267847458 +0100
@@ -29,9 +29,10 @@
 
 // types for X_PLATFORM
@@ -18141,9 +18136,9 @@
 #if X_PLATFORM == X_LINUX
 #define INLINE          inline
 #endif
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java jdk-jdk-21-35/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java
--- jdk-jdk-21-35.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java    2023-08-19 19:01:20.611564461 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/classes/sun/font/X11CNS11643.java    2024-01-27 14:37:30.305627404 +0100
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -18323,9 +18318,9 @@
+        }
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java jdk-jdk-21-35/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java
--- jdk-jdk-21-35.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java    2023-08-19 19:01:20.611813549 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/classes/sun/font/X11CNS11643P1.java    2024-01-27 14:37:30.305860242 +0100
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
@@ -18360,9 +18355,9 @@
+        super(1, "X11CNS11643P1");
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java jdk-jdk-21-35/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java
--- jdk-jdk-21-35.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java    2023-08-19 19:01:20.612056696 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/classes/sun/font/X11CNS11643P2.java    2024-01-27 14:37:30.306095883 +0100
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
@@ -18396,9 +18391,9 @@
+        super(2, "X11CNS11643P2");
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java jdk-jdk-21-35/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java
--- jdk-jdk-21-35.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java    2023-08-19 19:01:20.612295021 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/classes/sun/font/X11CNS11643P3.java    2024-01-27 14:37:30.306323801 +0100
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
@@ -18432,9 +18427,9 @@
+        super(3, "X11CNS11643P3");
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/solaris/data/fontconfig/fontconfig.properties jdk-jdk-21-35/src/java.desktop/solaris/data/fontconfig/fontconfig.properties
--- jdk-jdk-21-35.orig/src/java.desktop/solaris/data/fontconfig/fontconfig.properties    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.desktop/solaris/data/fontconfig/fontconfig.properties    2023-08-19 19:01:20.582789912 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/data/fontconfig/fontconfig.properties jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/data/fontconfig/fontconfig.properties
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/data/fontconfig/fontconfig.properties    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/data/fontconfig/fontconfig.properties    2024-01-27 14:37:30.282501269 +0100
@@ -0,0 +1,516 @@
+#
+#
@@ -18952,9 +18947,9 @@
+
+# Appended Font Path
+
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_PCM.c jdk-jdk-21-35/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_PCM.c
--- jdk-jdk-21-35.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_PCM.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_PCM.c    2023-08-19 19:01:20.612859191 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_PCM.c jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_PCM.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_PCM.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_PCM.c    2024-01-27 14:37:30.306873039 +0100
@@ -0,0 +1,627 @@
+/*
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -19583,9 +19578,9 @@
+
+
+#endif // USE_DAUDIO
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c jdk-jdk-21-35/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c
--- jdk-jdk-21-35.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c    2023-08-19 19:01:20.613339869 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c    2024-01-27 14:37:30.307358573 +0100
@@ -0,0 +1,600 @@
+/*
+ * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
@@ -20187,9 +20182,9 @@
+}
+
+#endif // USE_PORTS
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c jdk-jdk-21-35/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c
--- jdk-jdk-21-35.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c    2023-08-19 19:01:20.613632594 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c    2024-01-27 14:37:30.307640885 +0100
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -20384,9 +20379,9 @@
+    }
+    return 0;
+}
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h jdk-jdk-21-35/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h
--- jdk-jdk-21-35.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h    2023-08-19 19:01:20.613891960 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h    2024-01-27 14:37:30.307877338 +0100
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -20485,9 +20480,9 @@
+
+
+#endif // PLATFORM_API_SOLARISOS_UTILS_H_INCLUDED
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/awt/X11FontManager.java jdk-jdk-21-35/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
--- jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/awt/X11FontManager.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/unix/classes/sun/awt/X11FontManager.java    2023-08-19 19:01:20.563191134 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/awt/X11FontManager.java jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/awt/X11FontManager.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/awt/X11FontManager.java    2024-01-27 14:37:30.268323825 +0100
@@ -686,7 +686,8 @@
          * and do the best we can.
          */
@@ -20498,9 +20493,9 @@
             FcFontConfiguration fcFontConfig =
                 new FcFontConfiguration(this);
             if (fcFontConfig.init()) {
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java jdk-jdk-21-35/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
--- jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java    2023-08-19 19:01:20.563853706 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java    2024-01-27 14:37:30.268901108 +0100
@@ -68,7 +68,59 @@
      */
     protected void initReorderMap() {
@@ -20587,9 +20582,9 @@
             try {
                 File f;
                 if ((f = new File("/etc/fedora-release")).canRead()) {
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java jdk-jdk-21-35/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
--- jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java    2023-08-19 19:01:20.565206961 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java    2024-01-27 14:37:30.269567104 +0100
@@ -150,6 +150,10 @@
         return OSInfo.getOSType() == OSInfo.OSType.MACOSX;
     }
@@ -20637,9 +20632,9 @@
                 cmd[0] = "/usr/bin/sh";
                 cmd[1] = "-c";
                 cmd[2] = "env LC_ALL=C " + command;
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java jdk-jdk-21-35/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
--- jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java    2023-08-19 19:01:20.565855021 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java    2024-01-27 14:37:30.270511950 +0100
@@ -872,25 +872,51 @@
                         isAttributeCategorySupported(JobSheets.class)) {
             ncomps+=1;
@@ -20711,9 +20706,9 @@
         }
         execCmd[n++] = spoolFile;
         if (IPPPrintService.debugPrint) {
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/print/UnixPrintService.java jdk-jdk-21-35/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
--- jdk-jdk-21-35.orig/src/java.desktop/unix/classes/sun/print/UnixPrintService.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/unix/classes/sun/print/UnixPrintService.java    2023-08-19 19:01:20.566724564 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/print/UnixPrintService.java jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/classes/sun/print/UnixPrintService.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/classes/sun/print/UnixPrintService.java    2024-01-27 14:37:30.271195909 +0100
@@ -220,6 +220,31 @@
         return name;
     }
@@ -20808,10 +20803,10 @@
             return getAIXServiceAttributes();
         } else {
             return getBSDServiceAttributes();
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/unix/native/common/awt/fontpath.c jdk-jdk-21-35/src/java.desktop/unix/native/common/awt/fontpath.c
--- jdk-jdk-21-35.orig/src/java.desktop/unix/native/common/awt/fontpath.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/unix/native/common/awt/fontpath.c    2023-08-19 19:01:20.567596044 +0200
@@ -61,7 +61,57 @@
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/native/common/awt/fontpath.c jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/native/common/awt/fontpath.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/native/common/awt/fontpath.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/native/common/awt/fontpath.c    2024-01-27 14:37:30.271841656 +0100
@@ -57,7 +57,57 @@
 
 #define MAXFDIRS 512    /* Max number of directories that contain fonts */
 
@@ -20870,7 +20865,7 @@
 /* All the known interesting locations we have discovered on
  * various flavors of Linux
  */
@@ -177,6 +227,14 @@
@@ -173,6 +223,14 @@
         if (strstr(x11Path[i], ".gnome") != NULL) {
             continue;
         }
@@ -20885,7 +20880,7 @@
         fontdirs[pos] = strdup(x11Path[i]);
         slen = strlen(fontdirs[pos]);
         if (slen > 0 && fontdirs[pos][slen-1] == '/') {
@@ -326,6 +384,8 @@
@@ -322,6 +380,8 @@
 
 #if defined(__linux__)
     knowndirs = fullLinuxFontPath;
@@ -20894,9 +20889,9 @@
 #elif defined(_AIX)
     knowndirs = fullAixFontPath;
 #endif
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c jdk-jdk-21-35/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
--- jdk-jdk-21-35.orig/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c    2023-08-19 19:01:20.568453943 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c    2024-01-27 14:37:30.272488211 +0100
@@ -402,7 +402,12 @@
             xrenderLibHandle = dlopen("libXrender.so", RTLD_LAZY | RTLD_GLOBAL);
         }
@@ -20911,9 +20906,9 @@
         if (xrenderLibHandle == NULL) {
             xrenderLibHandle = dlopen("libXrender.a(libXrender.so.0)",
                                       RTLD_MEMBER | RTLD_LAZY | RTLD_GLOBAL);
diff -Nru jdk-jdk-21-35.orig/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c jdk-jdk-21-35/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c
--- jdk-jdk-21-35.orig/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c    2023-08-19 19:01:20.569306387 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c
--- jdk21u-jdk-21.0.2-ga.orig/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c    2024-01-27 14:37:30.273146556 +0100
@@ -61,6 +61,29 @@
 
 #include <dlfcn.h>
@@ -21000,9 +20995,9 @@
     free(colors);
     free(stops);
 
diff -Nru jdk-jdk-21-35.orig/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java jdk-jdk-21-35/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
--- jdk-jdk-21-35.orig/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java    2023-08-19 19:01:20.569925290 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java jdk21u-jdk-21.0.2-ga/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java    2024-01-27 14:37:30.273579611 +0100
@@ -91,6 +91,9 @@
                                 = System.getProperty("sun.security.jgss.lib");
                         if (defaultLib == null || defaultLib.trim().equals("")) {
@@ -21013,9 +21008,9 @@
                                 case LINUX -> new String[]{
                                         "libgssapi.so",
                                         "libgssapi_krb5.so",
diff -Nru jdk-jdk-21-35.orig/src/java.security.jgss/share/classes/sun/security/krb5/Config.java jdk-jdk-21-35/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
--- jdk-jdk-21-35.orig/src/java.security.jgss/share/classes/sun/security/krb5/Config.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.security.jgss/share/classes/sun/security/krb5/Config.java    2023-08-19 19:01:20.570704959 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.security.jgss/share/classes/sun/security/krb5/Config.java jdk21u-jdk-21.0.2-ga/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.security.jgss/share/classes/sun/security/krb5/Config.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.security.jgss/share/classes/sun/security/krb5/Config.java    2024-01-27 14:37:30.274195091 +0100
@@ -931,6 +931,8 @@
             if (name == null) {
                 name = "c:\\winnt\\krb5.ini";
@@ -21025,9 +21020,9 @@
         } else if (OperatingSystem.isMacOS()) {
             name = findMacosConfigFile();
         } else {
diff -Nru jdk-jdk-21-35.orig/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java jdk-jdk-21-35/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java
--- jdk-jdk-21-35.orig/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java    2023-08-19 19:01:20.571277184 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java jdk21u-jdk-21.0.2-ga/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java    2024-01-27 14:37:30.274635861 +0100
@@ -107,7 +107,7 @@
 
     private static long uid;
@@ -21037,9 +21032,9 @@
         uid = jdk.internal.misc.VM.geteuid();
     }
 
diff -Nru jdk-jdk-21-35.orig/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java jdk-jdk-21-35/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
--- jdk-jdk-21-35.orig/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java    2023-08-19 19:01:20.571867331 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java jdk21u-jdk-21.0.2-ga/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java    2024-01-27 14:37:30.275020167 +0100
@@ -82,8 +82,12 @@
         String s2 = lib.substring(k + 7);
         String libDir;
@@ -21055,9 +21050,9 @@
         } else {
             // must be 32-bit
             libDir = "lib";
diff -Nru jdk-jdk-21-35.orig/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java jdk-jdk-21-35/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java
--- jdk-jdk-21-35.orig/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java    2023-08-19 19:01:20.572494829 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java jdk21u-jdk-21.0.2-ga/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java
--- jdk21u-jdk-21.0.2-ga.orig/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java    2024-01-27 14:37:30.275494206 +0100
@@ -33,12 +33,21 @@
     private static final int KB = 1024;
     private static int BUFFER_SIZE = 4 * KB;
@@ -21081,9 +21076,9 @@
      */
     public WriterOutputBuffer(Writer writer) {
         _writer = new BufferedWriter(writer, BUFFER_SIZE);
diff -Nru jdk-jdk-21-35.orig/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java jdk-jdk-21-35/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java
--- jdk-jdk-21-35.orig/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java    2023-08-19 19:01:20.614378524 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java jdk21u-jdk-21.0.2-ga/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.attach/solaris/classes/sun/tools/attach/AttachProviderImpl.java    2024-01-27 14:37:30.308317671 +0100
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
@@ -21164,9 +21159,9 @@
+    }
+
+}
diff -Nru jdk-jdk-21-35.orig/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java jdk-jdk-21-35/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java
--- jdk-jdk-21-35.orig/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java    2023-08-19 19:01:20.614713238 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java jdk21u-jdk-21.0.2-ga/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java    2024-01-27 14:37:30.308642750 +0100
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -21440,9 +21435,9 @@
+        System.loadLibrary("attach");
+    }
+}
diff -Nru jdk-jdk-21-35.orig/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c jdk-jdk-21-35/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
--- jdk-jdk-21-35.orig/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c    2023-08-19 19:01:20.615165802 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c jdk21u-jdk-21.0.2-ga/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c    2024-01-27 14:37:30.309075251 +0100
@@ -0,0 +1,389 @@
+/*
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
@@ -21833,9 +21828,9 @@
+    free(buf);
+    return result;
+}
diff -Nru jdk-jdk-21-35.orig/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java jdk-jdk-21-35/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java
--- jdk-jdk-21-35.orig/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java    2023-08-19 19:01:20.573206823 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java jdk21u-jdk-21.0.2-ga/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.charsets/share/classes/sun/nio/cs/ext/JISAutoDetect.java    2024-01-27 14:37:30.275956829 +0100
@@ -94,7 +94,7 @@
     private static class Decoder extends CharsetDecoder {
 
@@ -21871,9 +21866,9 @@
+
     }
 }
diff -Nru jdk-jdk-21-35.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java jdk-jdk-21-35/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
--- jdk-jdk-21-35.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java    2023-08-19 19:01:20.573985477 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java jdk21u-jdk-21.0.2-ga/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java    2024-01-27 14:37:30.276436666 +0100
@@ -711,10 +711,15 @@
         lib = expand(lib);
         int i = lib.indexOf("/$ISA/");
@@ -21892,9 +21887,9 @@
         }
         if (DEBUG) {
             System.out.println(keyword + ": " + lib);
diff -Nru jdk-jdk-21-35.orig/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg jdk-jdk-21-35/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg
--- jdk-jdk-21-35.orig/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg    2023-08-19 19:01:20.615521355 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg jdk21u-jdk-21.0.2-ga/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg    2024-01-27 14:37:30.309418712 +0100
@@ -0,0 +1,23 @@
+#
+# Configuration file to allow the SunPKCS11 provider to utilize
@@ -21919,9 +21914,9 @@
+  SecureRandom
+}
+
diff -Nru jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java
--- jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java    2023-08-19 19:01:20.615782265 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java    2024-01-27 14:37:30.309688751 +0100
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
@@ -21988,9 +21983,9 @@
+    return mangled.toString();
+  }
+}
diff -Nru jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java
--- jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java    2023-08-19 19:01:20.616158071 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java    2024-01-27 14:37:30.310037084 +0100
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
@@ -22132,9 +22127,9 @@
+    }
+
+}
diff -Nru jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java
--- jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java    2023-08-19 19:01:20.616524538 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java    2024-01-27 14:37:30.310388763 +0100
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
@@ -22278,9 +22273,9 @@
+  }
+
+}
diff -Nru jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
--- jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java    2023-08-19 19:01:20.574682255 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java    2024-01-27 14:37:30.276869837 +0100
@@ -28,6 +28,8 @@
 
 import sun.jvm.hotspot.debugger.*;
@@ -22305,9 +22300,9 @@
             if (cpu.equals("x86")) {
                 access =  new Win32X86JavaThreadPDAccess();
             } else if (cpu.equals("amd64")) {
diff -Nru jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
--- jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java    2023-08-19 19:01:20.575281869 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java    2024-01-27 14:37:30.277255100 +0100
@@ -28,10 +28,14 @@
     system. */
 
@@ -22325,9 +22320,9 @@
       return "linux";
     } else if (os.equals("FreeBSD")) {
       return "bsd";
diff -Nru jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c jdk-jdk-21-35/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c
--- jdk-jdk-21-35.orig/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c    2023-08-19 19:01:20.575826463 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c    2024-01-27 14:37:30.277694745 +0100
@@ -22,6 +22,8 @@
  *
  */
@@ -22337,9 +22332,9 @@
 #if defined(LINUX) || defined(__APPLE__)
 #include <unistd.h>
 #include <fcntl.h>
diff -Nru jdk-jdk-21-35.orig/src/jdk.hotspot.agent/test/libproc/libproctest.sh jdk-jdk-21-35/src/jdk.hotspot.agent/test/libproc/libproctest.sh
--- jdk-jdk-21-35.orig/src/jdk.hotspot.agent/test/libproc/libproctest.sh    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.hotspot.agent/test/libproc/libproctest.sh    2023-08-19 19:01:20.576297859 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/test/libproc/libproctest.sh jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/test/libproc/libproctest.sh
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.hotspot.agent/test/libproc/libproctest.sh    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.hotspot.agent/test/libproc/libproctest.sh    2024-01-27 14:37:30.278089122 +0100
@@ -59,8 +59,10 @@
 kill -9 $pid
 
@@ -22352,9 +22347,9 @@
 
 # delete core
 rm -f core.$pid
diff -Nru jdk-jdk-21-35.orig/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c jdk-jdk-21-35/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c
--- jdk-jdk-21-35.orig/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c    2023-08-19 19:01:20.576962015 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c jdk21u-jdk-21.0.2-ga/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c    2024-01-27 14:37:30.278579164 +0100
@@ -33,8 +33,12 @@
 #include <errno.h>
 #include <string.h>
@@ -22413,9 +22408,9 @@
 long
 dbgsysCurrentTimeMillis() {
     struct timeval t;
diff -Nru jdk-jdk-21-35.orig/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c jdk-jdk-21-35/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c
--- jdk-jdk-21-35.orig/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk-jdk-21-35/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c    2023-08-19 19:01:20.616968626 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c jdk21u-jdk-21.0.2-ga/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c    1970-01-01 01:00:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c    2024-01-27 14:37:30.310811602 +0100
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
@@ -22671,9 +22666,9 @@
+{
+    return -1;
+}
diff -Nru jdk-jdk-21-35.orig/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c jdk-jdk-21-35/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c
--- jdk-jdk-21-35.orig/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c    2023-08-19 19:01:20.577651735 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c jdk21u-jdk-21.0.2-ga/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c    2024-01-27 14:37:30.279084086 +0100
@@ -85,7 +85,63 @@
 // true = get available swap in bytes
 // false = get total swap in bytes
@@ -22787,9 +22782,9 @@
     clk_tck = (jlong) sysconf(_SC_CLK_TCK);
 #elif defined(__linux__) || defined(_ALLBSD_SOURCE)
     clk_tck = 100;
diff -Nru jdk-jdk-21-35.orig/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java jdk-jdk-21-35/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java
--- jdk-jdk-21-35.orig/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java    2023-08-19 19:01:20.578337885 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java jdk21u-jdk-21.0.2-ga/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java    2024-01-27 14:37:30.279488397 +0100
@@ -44,6 +44,12 @@
     /* -- Miscellaneous SCTP utilities -- */
 
@@ -22803,9 +22798,9 @@
         /* lksctp/linux requires Ipv4 addresses */
         return false;
     }
diff -Nru jdk-jdk-21-35.orig/src/jdk.sctp/unix/native/libsctp/Sctp.h jdk-jdk-21-35/src/jdk.sctp/unix/native/libsctp/Sctp.h
--- jdk-jdk-21-35.orig/src/jdk.sctp/unix/native/libsctp/Sctp.h    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.sctp/unix/native/libsctp/Sctp.h    2023-08-19 19:01:20.579002629 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.sctp/unix/native/libsctp/Sctp.h jdk21u-jdk-21.0.2-ga/src/jdk.sctp/unix/native/libsctp/Sctp.h
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.sctp/unix/native/libsctp/Sctp.h    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.sctp/unix/native/libsctp/Sctp.h    2024-01-27 14:37:30.279911901 +0100
@@ -26,6 +26,48 @@
 #ifndef SUN_NIO_CH_SCTP_H
 #define SUN_NIO_CH_SCTP_H
@@ -22864,9 +22859,9 @@
 extern sctp_getladdrs_func* nio_sctp_getladdrs;
 extern sctp_freeladdrs_func* nio_sctp_freeladdrs;
 extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
diff -Nru jdk-jdk-21-35.orig/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c jdk-jdk-21-35/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c
--- jdk-jdk-21-35.orig/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c    2023-08-19 19:01:20.579545370 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c jdk21u-jdk-21.0.2-ga/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c    2024-01-27 14:37:30.280290360 +0100
@@ -331,11 +331,10 @@
             break;
         case SCTP_ADDR_MADE_PRIM :
@@ -22880,9 +22875,9 @@
 #endif  /* __linux__ */
     }
 
diff -Nru jdk-jdk-21-35.orig/src/jdk.sctp/unix/native/libsctp/SctpNet.c jdk-jdk-21-35/src/jdk.sctp/unix/native/libsctp/SctpNet.c
--- jdk-jdk-21-35.orig/src/jdk.sctp/unix/native/libsctp/SctpNet.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.sctp/unix/native/libsctp/SctpNet.c    2023-08-19 19:01:20.580175449 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.sctp/unix/native/libsctp/SctpNet.c jdk21u-jdk-21.0.2-ga/src/jdk.sctp/unix/native/libsctp/SctpNet.c
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.sctp/unix/native/libsctp/SctpNet.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.sctp/unix/native/libsctp/SctpNet.c    2024-01-27 14:37:30.280744204 +0100
@@ -371,7 +371,11 @@
     int i, addrCount;
     jobjectArray isaa;
@@ -22907,9 +22902,9 @@
         sctpHandleSocketError(env, errno);
         return NULL;
     }
diff -Nru jdk-jdk-21-35.orig/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java jdk-jdk-21-35/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
--- jdk-jdk-21-35.orig/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java    2023-08-19 19:01:20.581128923 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java jdk21u-jdk-21.0.2-ga/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java    2024-01-27 14:37:30.281313814 +0100
@@ -104,7 +104,7 @@
  * to false if you do not want this module to use the ticket cache.
  * (Default is False).
@@ -22919,9 +22914,9 @@
  * it will look for the ticket cache in /tmp/krb5cc_{@code uid}
  * where the uid is numeric user identifier. If the ticket cache is
  * not available in the above location, or if we are on a
diff -Nru jdk-jdk-21-35.orig/src/jdk.security.auth/unix/native/libjaas/Unix.c jdk-jdk-21-35/src/jdk.security.auth/unix/native/libjaas/Unix.c
--- jdk-jdk-21-35.orig/src/jdk.security.auth/unix/native/libjaas/Unix.c    2023-08-09 22:19:41.000000000 +0200
+++ jdk-jdk-21-35/src/jdk.security.auth/unix/native/libjaas/Unix.c    2023-08-19 19:01:20.581685282 +0200
diff -Nru jdk21u-jdk-21.0.2-ga.orig/src/jdk.security.auth/unix/native/libjaas/Unix.c jdk21u-jdk-21.0.2-ga/src/jdk.security.auth/unix/native/libjaas/Unix.c
--- jdk21u-jdk-21.0.2-ga.orig/src/jdk.security.auth/unix/native/libjaas/Unix.c    2024-01-16 17:19:00.000000000 +0100
+++ jdk21u-jdk-21.0.2-ga/src/jdk.security.auth/unix/native/libjaas/Unix.c    2024-01-27 14:37:30.281670663 +0100
@@ -32,6 +32,10 @@
 #include <stdlib.h>
 #include <string.h>

 components/runtime/openjdk-21/patches/README-zero.txt

@@ -21,8 +21,8 @@
Adds the src/hotspot/os_cpu/solaris_zero directory and contents

These are current and tested for a successful build (not necessarily
fully working) as of jdk 21+20. They don't provide a proper zero port,
as they still have x86 assembler that needs to be removed. But this
fully working) as of jdk 21.0.1. They don't provide a proper zero port,
as they still have 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

 components/runtime/openjdk-21/patches/README.txt

@@ -12,6 +12,18 @@
* jshell doesn't work
* illuminate doesn't work

21.0.2

A bit of shuffling in ProcessHandleImpl_unix.c

21.0.1

Now jdk21u.

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.

21+34, 21+35

No changes.

 components/runtime/openjdk-21/patches/illumos-port-02.patch

@@ -1,6 +1,6 @@
--- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c    Thu May 28 11:43:30 2020
+++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c    Wed May 20 19:29:11 2020
@@ -379,7 +379,41 @@
@@ -499,7 +499,41 @@
     return (jint)res;
 }
 
@@ -42,7 +42,7 @@
 Java_sun_nio_fs_UnixNativeDispatcher_rewind(JNIEnv* env, jclass this, jlong stream)
 {
     FILE* fp = jlong_to_ptr(stream);
@@ -1046,6 +1080,33 @@
@@ -1262,6 +1296,33 @@
     }
 }
 

 components/runtime/openjdk-21/patches/illumos-port-23.patch

@@ -1,6 +1,6 @@
--- a/src/java.base/share/classes/jdk/internal/util/OperatingSystem.java    Wed Mar 29 20:12:02 2023
+++ b/src/java.base/share/classes/jdk/internal/util/OperatingSystem.java    Thu Mar 30 13:44:42 2023
@@ -79,6 +79,10 @@
@@ -81,6 +81,10 @@
      * The AIX Operating system.
      */
     AIX,
@@ -11,7 +11,7 @@
     ;
 
     // The current OperatingSystem
@@ -116,6 +120,14 @@
@@ -118,6 +122,14 @@
         return PlatformProps.TARGET_OS_IS_AIX;
     }
 
@@ -28,7 +28,7 @@
      */
--- a/src/java.base/share/classes/jdk/internal/util/PlatformProps.java.template    Wed Mar 29 20:12:02 2023
+++ b/src/java.base/share/classes/jdk/internal/util/PlatformProps.java.template    Thu Mar 30 13:43:29 2023
@@ -37,6 +37,7 @@
@@ -39,6 +39,7 @@
     static final boolean TARGET_OS_IS_MACOS   = "@@OPENJDK_TARGET_OS@@" == "macos";
     static final boolean TARGET_OS_IS_WINDOWS = "@@OPENJDK_TARGET_OS@@" == "windows";
     static final boolean TARGET_OS_IS_AIX     = "@@OPENJDK_TARGET_OS@@" == "aix";

 components/runtime/openjdk-21/patches/illumos-zero-2.patch

@@ -563,7 +563,7 @@
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Stubs for things that would be in bsd_zero.s if it existed.
+// Stubs for things that would be in solaris_zero.s if it existed.
+// You probably want to disassemble these monkeys to check they're ok.
+
+extern "C" {

 components/runtime/openjdk-21/pkg5

@@ -11,8 +11,8 @@
        "system/library",
        "system/library/c++/sunpro",
        "system/library/freetype-2",
        "system/library/g++-10-runtime",
        "system/library/gcc-10-runtime",
        "system/library/g++-13-runtime",
        "system/library/gcc-13-runtime",
        "system/library/math",
        "x11/library/libx11",
        "x11/library/libxext",
@@ -25,4 +25,4 @@
        "runtime/java/openjdk21"
    ],
    "name": "openjdk"
}
}

			@@ -13,23 +13,24 @@
			# Copyright 2016 Alexander Pyhalov
			# Copyright 2019 Michal Nowak
			# Copyright 2021 Andreas Grueninger, Grueninger GmbH, (grueni). All rights reserved.
			# Copyright 2023 Niklas Poslovski
			# Copyright 2023-2024 Niklas Poslovski
			#

			include ../../../make-rules/shared-macros.mk

			OPENJDK_VERSION= 21
			OPENJDK_PATCH= 35
			OPENJDK_UPDATE= 0
			OPENJDK_BUILD= 2
			COMPONENT_NAME= openjdk
			COMPONENT_VERSION= $(OPENJDK_VERSION)
			COMPONENT_VERSION= $(OPENJDK_VERSION).$(OPENJDK_UPDATE).$(OPENJDK_BUILD)
			COMPONENT_FMRI= runtime/java/$(COMPONENT_NAME)$(OPENJDK_VERSION)
			COMPONENT_SUMMARY= Open-source implementation of the Java Platform, Standard Edition
			COMPONENT_SRC= jdk-jdk-$(OPENJDK_VERSION)-$(OPENJDK_PATCH)
			COMPONENT_ARCHIVE= jdk-$(OPENJDK_VERSION)+$(OPENJDK_PATCH).tar.gz
			COMPONENT_SRC= jdk$(OPENJDK_VERSION)u-jdk-$(OPENJDK_VERSION).$(OPENJDK_UPDATE).$(OPENJDK_BUILD)-ga
			COMPONENT_ARCHIVE= jdk-$(OPENJDK_VERSION).$(OPENJDK_UPDATE).$(OPENJDK_BUILD)-ga.tar.gz
			COMPONENT_ARCHIVE_HASH= \
			sha256:0a0a978c8f55176d2a807d0c88e31810aaf13c8889ac4ba19af4f4a4c188d3e4
			sha256:17eda717843ffbbacc7de4bdcd934f404a23a57ebb3cda3cec630a668651531f
			COMPONENT_ARCHIVE_URL= \
			https://github.com/openjdk/jdk/archive/$(COMPONENT_ARCHIVE)
			https://github.com/openjdk/jdk$(OPENJDK_VERSION)u/archive/$(COMPONENT_ARCHIVE)
			COMPONENT_PROJECT_URL= https://openjdk.java.net/
			COMPONENT_CLASSIFICATION= Development/Java
			COMPONENT_LICENSE= GPLv2 with Classpath Exception

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2023 <contributor>
			# Copyright 2024 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

			@@ -21,8 +21,8 @@
			Adds the src/hotspot/os_cpu/solaris_zero directory and contents

			These are current and tested for a successful build (not necessarily
			fully working) as of jdk 21+20. They don't provide a proper zero port,
			as they still have x86 assembler that needs to be removed. But this
			fully working) as of jdk 21.0.1. They don't provide a proper zero port,
			as they still have 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

			@@ -12,6 +12,18 @@
			* jshell doesn't work
			* illuminate doesn't work

			21.0.2

			A bit of shuffling in ProcessHandleImpl_unix.c

			21.0.1

			Now jdk21u.

			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.

			21+34, 21+35

			No changes.

			@@ -1,6 +1,6 @@
			--- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c Thu May 28 11:43:30 2020
			+++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c Wed May 20 19:29:11 2020
			@@ -379,7 +379,41 @@
			@@ -499,7 +499,41 @@
			return (jint)res;
			}

			@@ -42,7 +42,7 @@
			Java_sun_nio_fs_UnixNativeDispatcher_rewind(JNIEnv* env, jclass this, jlong stream)
			{
			FILE* fp = jlong_to_ptr(stream);
			@@ -1046,6 +1080,33 @@
			@@ -1262,6 +1296,33 @@
			}
			}

			@@ -1,6 +1,6 @@
			--- a/src/java.base/share/classes/jdk/internal/util/OperatingSystem.java Wed Mar 29 20:12:02 2023
			+++ b/src/java.base/share/classes/jdk/internal/util/OperatingSystem.java Thu Mar 30 13:44:42 2023
			@@ -79,6 +79,10 @@
			@@ -81,6 +81,10 @@
			* The AIX Operating system.
			*/
			AIX,
			@@ -11,7 +11,7 @@
			;

			// The current OperatingSystem
			@@ -116,6 +120,14 @@
			@@ -118,6 +122,14 @@
			return PlatformProps.TARGET_OS_IS_AIX;
			}

			@@ -28,7 +28,7 @@
			*/
			--- a/src/java.base/share/classes/jdk/internal/util/PlatformProps.java.template Wed Mar 29 20:12:02 2023
			+++ b/src/java.base/share/classes/jdk/internal/util/PlatformProps.java.template Thu Mar 30 13:43:29 2023
			@@ -37,6 +37,7 @@
			@@ -39,6 +39,7 @@
			static final boolean TARGET_OS_IS_MACOS = "@@OPENJDK_TARGET_OS@@" == "macos";
			static final boolean TARGET_OS_IS_WINDOWS = "@@OPENJDK_TARGET_OS@@" == "windows";
			static final boolean TARGET_OS_IS_AIX = "@@OPENJDK_TARGET_OS@@" == "aix";

			@@ -563,7 +563,7 @@
			+}
			+
			+/////////////////////////////////////////////////////////////////////////////
			+// Stubs for things that would be in bsd_zero.s if it existed.
			+// Stubs for things that would be in solaris_zero.s if it existed.
			+// You probably want to disassemble these monkeys to check they're ok.
			+
			+extern "C" {

			@@ -11,8 +11,8 @@
			"system/library",
			"system/library/c++/sunpro",
			"system/library/freetype-2",
			"system/library/g++-10-runtime",
			"system/library/gcc-10-runtime",
			"system/library/g++-13-runtime",
			"system/library/gcc-13-runtime",
			"system/library/math",
			"x11/library/libx11",
			"x11/library/libxext",
			@@ -25,4 +25,4 @@
			"runtime/java/openjdk21"
			],
			"name": "openjdk"
			}
			}