From ea66c28bbd7db62983e21ce7d0fcac417684eb55 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 25 Jan 2024 17:51:41 +0000 Subject: [PATCH 1/3] openjdk8: update from 1.8.392-08 to 1.8.402-06 --- build/openjdk8/build.sh | 4 ++-- build/openjdk8/patches/KPIC.patch | 6 +++--- build/openjdk8/patches/illumos-port-6.patch | 2 +- build/openjdk8/patches/ldflags-pie.patch | 4 ++-- build/openjdk8/patches/patch-as.patch | 2 +- build/openjdk8/patches/patch-at.patch | 2 +- .../patch-common_autoconf_boot-jdk.m4.patch | 2 +- ...mmon_autoconf_generated-configure.sh.patch | 20 +++++++++---------- .../patch-common_autoconf_spec.gmk.in.patch | 2 +- ...pot_make_solaris_makefiles_adlc.make.patch | 2 +- ..._solaris_makefiles_build__vm__def.sh.patch | 2 +- ...ot_make_solaris_makefiles_debug.make.patch | 2 +- ...t_make_solaris_makefiles_dtrace.make.patch | 2 +- ...ake_solaris_makefiles_fastdebug.make.patch | 2 +- ...spot_make_solaris_makefiles_gcc.make.patch | 2 +- ...pot_make_solaris_makefiles_jsig.make.patch | 2 +- ...makefiles_mapfile-vers-COMPILER1.gcc.patch | 2 +- ...makefiles_mapfile-vers-COMPILER2.gcc.patch | 2 +- ...is_makefiles_mapfile-vers-TIERED.gcc.patch | 2 +- ...ake_solaris_makefiles_optimized.make.patch | 2 +- ..._make_solaris_makefiles_product.make.patch | 2 +- ...t_make_solaris_makefiles_saproc.make.patch | 2 +- ...tspot_make_solaris_makefiles_vm.make.patch | 2 +- ..._cpu_zero_vm_methodHandles__zero.cpp.patch | 2 +- ...src_cpu_zero_vm_nativeInst__zero.cpp.patch | 2 +- ...6_vm_atomic__solaris__x86.inline.hpp.patch | 2 +- ...orderAccess__solaris__x86.inline.hpp.patch | 2 +- ...solaris__x86_vm_os__solaris__x86.cpp.patch | 2 +- ...__x86_vm_os__solaris__x86.inline.hpp.patch | 2 +- ...vm_prefetch__solaris__x86.inline.hpp.patch | 2 +- ...otspot_src_os_posix_vm_os__posix.cpp.patch | 2 +- ...spot_src_os_solaris_dtrace_jhelper.d.patch | 2 +- ...otspot_src_os_solaris_proc__Makefile.patch | 2 +- ...spot_src_os_solaris_proc__saproc.cpp.patch | 2 +- ...c_os_solaris_vm_decoder__solaris.cpp.patch | 2 +- ...ot_src_os_solaris_vm_os__solaris.cpp.patch | 2 +- ...s_solaris_vm_perfMemory__solaris.cpp.patch | 2 +- ...-hotspot_src_share_vm_oops_klass.hpp.patch | 2 +- ..._src_share_vm_opto_library__call.cpp.patch | 2 +- ...h-hotspot_src_share_vm_opto_node.cpp.patch | 2 +- ...t_src_share_vm_runtime_arguments.cpp.patch | 2 +- ...utilities_globalDefinitions__gcc.hpp.patch | 2 +- ...src_share_vm_utilities_hashtable.cpp.patch | 2 +- .../patch-jdk_make_CompileDemos.gmk.patch | 2 +- .../patch-jdk_make_CompileLaunchers.gmk.patch | 4 ++-- .../patch-jdk_make_CreateJars.gmk.patch | 2 +- .../patch-jdk_make_GenerateSources.gmk.patch | 2 +- .../patches/patch-jdk_make_Images.gmk.patch | 6 +++--- ...atch-jdk_make_lib_Awt2dLibraries.gmk.patch | 2 +- ...ive_sun_awt_image_jpeg_imageioJPEG.c.patch | 2 +- ...ive_sun_awt_image_jpeg_jpegdecoder.c.patch | 2 +- ...ive_sun_security_ec_impl_ecc__impl.h.patch | 2 +- .../patch-jdk_src_solaris_bin_ergo.c.patch | 2 +- ...tch-jdk_src_solaris_bin_ergo__i586.c.patch | 2 +- ...s_native_java_net_NetworkInterface.c.patch | 2 +- ...aris_native_java_net_net__util__md.c.patch | 2 +- ...rc_solaris_native_sun_awt_X11Color.c.patch | 2 +- .../patches/patch-jdk_test_Makefile.patch | 2 +- ...ntrospector_4168475_Test4168475.java.patch | 2 +- ...ntrospector_4520754_Test4520754.java.patch | 2 +- ..._beans_Introspector_Test4144543.java.patch | 2 +- ...stemMXBean_GetSystemLoadAverage.java.patch | 2 +- ...jdk_test_sun_security_ec_TestEC.java.patch | 2 +- build/openjdk8/patches/patch-pkcs11.patch | 2 +- 64 files changed, 80 insertions(+), 80 deletions(-) diff --git a/build/openjdk8/build.sh b/build/openjdk8/build.sh index e23c401dc7..7b57438a51 100755 --- a/build/openjdk8/build.sh +++ b/build/openjdk8/build.sh @@ -18,8 +18,8 @@ PROG=openjdk VER=1.8 -UPDATE=392 -BUILD=08 +UPDATE=402 +BUILD=06 PKG=openjdk ##IGNORE## - filled in later SUMMARY="tbc"; DESC="tbc" diff --git a/build/openjdk8/patches/KPIC.patch b/build/openjdk8/patches/KPIC.patch index fc751ed537..63fd1f0264 100644 --- a/build/openjdk8/patches/KPIC.patch +++ b/build/openjdk8/patches/KPIC.patch @@ -1,4 +1,4 @@ -diff -wpruN '--exclude=*.orig' a~/jdk/make/CompileLaunchers.gmk a/jdk/make/CompileLaunchers.gmk +diff -wpruN --no-dereference '--exclude=*.orig' a~/jdk/make/CompileLaunchers.gmk a/jdk/make/CompileLaunchers.gmk --- a~/jdk/make/CompileLaunchers.gmk 1970-01-01 00:00:00 +++ a/jdk/make/CompileLaunchers.gmk 1970-01-01 00:00:00 @@ -163,7 +163,7 @@ define SetupLauncher @@ -10,7 +10,7 @@ diff -wpruN '--exclude=*.orig' a~/jdk/make/CompileLaunchers.gmk a/jdk/make/Compi LDFLAGS := $(LDFLAGS_JDKEXE) \ $(ORIGIN_ARG) \ $$($1_LDFLAGS), \ -@@ -516,7 +516,7 @@ $(eval $(call SetupNativeCompilation,BUI +@@ -523,7 +523,7 @@ $(eval $(call SetupNativeCompilation,BUI -DFULL, \ CFLAGS_release := -DPRODUCT, \ CFLAGS_linux := -fPIC, \ @@ -19,7 +19,7 @@ diff -wpruN '--exclude=*.orig' a~/jdk/make/CompileLaunchers.gmk a/jdk/make/Compi CFLAGS_macosx := -fPIC, \ MAPFILE := $(UNPACK_MAPFILE),\ LDFLAGS := $(UNPACKEXE_ZIPOBJS), \ -@@ -626,7 +626,7 @@ ifneq ($(BUILD_JEXEC_SRC), ) +@@ -633,7 +633,7 @@ ifneq ($(BUILD_JEXEC_SRC), ) CFLAGS := $(CFLAGS_JDKEXE) \ $(BUILD_JEXEC_INC), \ CFLAGS_linux := -fPIC, \ diff --git a/build/openjdk8/patches/illumos-port-6.patch b/build/openjdk8/patches/illumos-port-6.patch index f5bf1b9576..85bd4ae0a6 100644 --- a/build/openjdk8/patches/illumos-port-6.patch +++ b/build/openjdk8/patches/illumos-port-6.patch @@ -4,7 +4,7 @@ The problem is that we want a guard based on platform, but _GNU_SOURCE is a per-toolchain define for the gcc toolchain. It "fixes" AIX because that's using the xlc toolchain. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/share/vm/runtime/os.cpp a/hotspot/src/share/vm/runtime/os.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/share/vm/runtime/os.cpp a/hotspot/src/share/vm/runtime/os.cpp --- a~/hotspot/src/share/vm/runtime/os.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/share/vm/runtime/os.cpp 1970-01-01 00:00:00 @@ -148,7 +148,7 @@ char* os::iso8601_time(char* buffer, siz diff --git a/build/openjdk8/patches/ldflags-pie.patch b/build/openjdk8/patches/ldflags-pie.patch index 1bec2b3a7a..50b235e3ff 100644 --- a/build/openjdk8/patches/ldflags-pie.patch +++ b/build/openjdk8/patches/ldflags-pie.patch @@ -1,7 +1,7 @@ -diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/common/autoconf/generated-configure.sh +diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/common/autoconf/generated-configure.sh --- a~/common/autoconf/generated-configure.sh 1970-01-01 00:00:00 +++ a/common/autoconf/generated-configure.sh 1970-01-01 00:00:00 -@@ -43003,7 +43003,7 @@ $as_echo "$supports" >&6; } +@@ -43516,7 +43516,7 @@ $as_echo "$supports" >&6; } # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous # java heap. if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then diff --git a/build/openjdk8/patches/patch-as.patch b/build/openjdk8/patches/patch-as.patch index 05b5079972..9ba56c1821 100644 --- a/build/openjdk8/patches/patch-as.patch +++ b/build/openjdk8/patches/patch-as.patch @@ -1,6 +1,6 @@ $NetBSD: patch-as,v 1.1 2015/02/08 08:41:25 tnn Exp $ -diff -wpruN '--exclude=*.orig' a~/jdk/src/share/classes/sun/applet/AppletViewerPanel.java a/jdk/src/share/classes/sun/applet/AppletViewerPanel.java +diff -wpruN --no-dereference '--exclude=*.orig' a~/jdk/src/share/classes/sun/applet/AppletViewerPanel.java a/jdk/src/share/classes/sun/applet/AppletViewerPanel.java --- a~/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 1970-01-01 00:00:00 +++ a/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 1970-01-01 00:00:00 @@ -42,25 +42,25 @@ import sun.tools.jar.*; diff --git a/build/openjdk8/patches/patch-at.patch b/build/openjdk8/patches/patch-at.patch index 020eb5db6c..69f15de248 100644 --- a/build/openjdk8/patches/patch-at.patch +++ b/build/openjdk8/patches/patch-at.patch @@ -1,6 +1,6 @@ $NetBSD: patch-at,v 1.1 2015/02/08 08:41:25 tnn Exp $ -diff -wpruN '--exclude=*.orig' a~/jdk/src/share/classes/sun/applet/AppletPanel.java a/jdk/src/share/classes/sun/applet/AppletPanel.java +diff -wpruN --no-dereference '--exclude=*.orig' a~/jdk/src/share/classes/sun/applet/AppletPanel.java a/jdk/src/share/classes/sun/applet/AppletPanel.java --- a~/jdk/src/share/classes/sun/applet/AppletPanel.java 1970-01-01 00:00:00 +++ a/jdk/src/share/classes/sun/applet/AppletPanel.java 1970-01-01 00:00:00 @@ -61,7 +61,7 @@ abstract class AppletPanel extends Panel diff --git a/build/openjdk8/patches/patch-common_autoconf_boot-jdk.m4.patch b/build/openjdk8/patches/patch-common_autoconf_boot-jdk.m4.patch index bcd265de8a..97ee56fcfa 100644 --- a/build/openjdk8/patches/patch-common_autoconf_boot-jdk.m4.patch +++ b/build/openjdk8/patches/patch-common_autoconf_boot-jdk.m4.patch @@ -1,6 +1,6 @@ $NetBSD: patch-common_autoconf_boot-jdk.m4,v 1.2 2016/02/08 14:45:39 ryoon Exp $ -diff -wpruN '--exclude=*.orig' a~/common/autoconf/boot-jdk.m4 a/common/autoconf/boot-jdk.m4 +diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/boot-jdk.m4 a/common/autoconf/boot-jdk.m4 --- a~/common/autoconf/boot-jdk.m4 1970-01-01 00:00:00 +++ a/common/autoconf/boot-jdk.m4 1970-01-01 00:00:00 @@ -334,16 +334,15 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR diff --git a/build/openjdk8/patches/patch-common_autoconf_generated-configure.sh.patch b/build/openjdk8/patches/patch-common_autoconf_generated-configure.sh.patch index e70e5954ed..8f218a21fc 100644 --- a/build/openjdk8/patches/patch-common_autoconf_generated-configure.sh.patch +++ b/build/openjdk8/patches/patch-common_autoconf_generated-configure.sh.patch @@ -1,7 +1,7 @@ -diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/common/autoconf/generated-configure.sh +diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/common/autoconf/generated-configure.sh --- a~/common/autoconf/generated-configure.sh 1970-01-01 00:00:00 +++ a/common/autoconf/generated-configure.sh 1970-01-01 00:00:00 -@@ -4188,7 +4188,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi +@@ -4183,7 +4183,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi # These toolchains are valid on different platforms VALID_TOOLCHAINS_linux="gcc clang" @@ -10,7 +10,7 @@ diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/commo VALID_TOOLCHAINS_macosx="gcc clang" VALID_TOOLCHAINS_aix="xlc" VALID_TOOLCHAINS_windows="microsoft" -@@ -25117,6 +25117,7 @@ $as_echo_n "checking flags for boot jdk +@@ -25617,6 +25617,7 @@ $as_echo_n "checking flags for boot jdk JVM_MAX_HEAP=1600M STACK_SIZE=1536 fi @@ -18,7 +18,7 @@ diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/commo $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5 $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5 -@@ -41919,6 +41920,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -42432,6 +42433,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; } SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' SET_SHARED_LIBRARY_MAPFILE='' @@ -33,7 +33,7 @@ diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/commo else # Default works for linux, might work on other platforms as well. SHARED_LIBRARY_FLAGS='-shared' -@@ -41987,11 +41996,6 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -42500,11 +42509,6 @@ $as_echo "$ac_cv_c_bigendian" >&6; } @@ -45,7 +45,7 @@ diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/commo # The (cross) compiler is now configured, we can now test capabilities # of the target platform. -@@ -42090,6 +42094,11 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -42603,6 +42607,11 @@ $as_echo "$ac_cv_c_bigendian" >&6; } C_O_FLAG_HI="-Os" C_O_FLAG_NORM="-Os" C_O_FLAG_NONE="" @@ -57,7 +57,7 @@ diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/commo else C_O_FLAG_HIGHEST="-O3" C_O_FLAG_HI="-O3" -@@ -42148,9 +42157,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -42661,9 +42670,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; } CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" elif test "x$TOOLCHAIN_TYPE" = xgcc; then @@ -70,7 +70,7 @@ diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/commo LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" fi -@@ -42275,7 +42284,7 @@ fi +@@ -42788,7 +42797,7 @@ fi if test "x$TOOLCHAIN_TYPE" = xgcc; then # these options are used for both C and C++ compiles CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \ @@ -79,7 +79,7 @@ diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/commo case $OPENJDK_TARGET_CPU_ARCH in arm ) # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing -@@ -44276,11 +44285,8 @@ fi +@@ -44789,11 +44798,8 @@ fi if test "x$OPENJDK_TARGET_OS" = xsolaris; then OPENWIN_HOME="/usr/openwin" @@ -93,7 +93,7 @@ diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/commo fi # -@@ -48365,7 +48371,7 @@ $as_echo "$as_me: The path of FREETYPE_L +@@ -49120,7 +49126,7 @@ $as_echo "$as_me: The path of FREETYPE_L if test "x$OPENJDK_TARGET_OS" = xwindows; then FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib" else diff --git a/build/openjdk8/patches/patch-common_autoconf_spec.gmk.in.patch b/build/openjdk8/patches/patch-common_autoconf_spec.gmk.in.patch index 25c630de93..8888431f60 100644 --- a/build/openjdk8/patches/patch-common_autoconf_spec.gmk.in.patch +++ b/build/openjdk8/patches/patch-common_autoconf_spec.gmk.in.patch @@ -1,6 +1,6 @@ $NetBSD: patch-common_autoconf_spec.gmk.in,v 1.4 2015/06/10 13:29:57 tnn Exp $ -diff -wpruN '--exclude=*.orig' a~/common/autoconf/spec.gmk.in a/common/autoconf/spec.gmk.in +diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/spec.gmk.in a/common/autoconf/spec.gmk.in --- a~/common/autoconf/spec.gmk.in 1970-01-01 00:00:00 +++ a/common/autoconf/spec.gmk.in 1970-01-01 00:00:00 @@ -392,7 +392,8 @@ endif diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_adlc.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_adlc.make.patch index f6d8365442..7e87a21bae 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_adlc.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_adlc.make.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_adlc.make,v 1.1 2015/07/03 20:40:5 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/adlc.make a/hotspot/make/solaris/makefiles/adlc.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/adlc.make a/hotspot/make/solaris/makefiles/adlc.make --- a~/hotspot/make/solaris/makefiles/adlc.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/adlc.make 1970-01-01 00:00:00 @@ -71,6 +71,7 @@ ifndef USE_GCC diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_build__vm__def.sh.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_build__vm__def.sh.patch index 7fdd66acea..6006da24e9 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_build__vm__def.sh.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_build__vm__def.sh.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_build__vm__def.sh,v 1.1 2015/07/03 Fix path to nm. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/build_vm_def.sh a/hotspot/make/solaris/makefiles/build_vm_def.sh +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/build_vm_def.sh a/hotspot/make/solaris/makefiles/build_vm_def.sh --- a~/hotspot/make/solaris/makefiles/build_vm_def.sh 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/build_vm_def.sh 1970-01-01 00:00:00 @@ -1,6 +1,6 @@ diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_debug.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_debug.make.patch index 5f361d6691..fa89ce9b9a 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_debug.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_debug.make.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_debug.make,v 1.1 2015/07/03 20:40: GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/debug.make a/hotspot/make/solaris/makefiles/debug.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/debug.make a/hotspot/make/solaris/makefiles/debug.make --- a~/hotspot/make/solaris/makefiles/debug.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/debug.make 1970-01-01 00:00:00 @@ -49,7 +49,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_dtrace.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_dtrace.make.patch index e7a0a3bf72..e8c7ae5c06 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_dtrace.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_dtrace.make.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_dtrace.make,v 1.1 2015/07/03 20:40 Enable DTrace support with GCC. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/dtrace.make a/hotspot/make/solaris/makefiles/dtrace.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/dtrace.make a/hotspot/make/solaris/makefiles/dtrace.make --- a~/hotspot/make/solaris/makefiles/dtrace.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/dtrace.make 1970-01-01 00:00:00 @@ -29,13 +29,6 @@ diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_fastdebug.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_fastdebug.make.patch index 5a249033b5..7089b83e46 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_fastdebug.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_fastdebug.make.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_fastdebug.make,v 1.1 2015/07/03 20 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/fastdebug.make a/hotspot/make/solaris/makefiles/fastdebug.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/fastdebug.make a/hotspot/make/solaris/makefiles/fastdebug.make --- a~/hotspot/make/solaris/makefiles/fastdebug.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/fastdebug.make 1970-01-01 00:00:00 @@ -120,7 +120,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make.patch index 0008fa4495..48ccecae27 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.2 2015/07/18 07:07:42 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/gcc.make a/hotspot/make/solaris/makefiles/gcc.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/gcc.make a/hotspot/make/solaris/makefiles/gcc.make --- a~/hotspot/make/solaris/makefiles/gcc.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/gcc.make 1970-01-01 00:00:00 @@ -70,11 +70,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG) diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make.patch index cf1de0f8a5..62b5a001ed 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_jsig.make.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_jsig.make,v 1.1 2015/07/03 20:40:5 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/jsig.make a/hotspot/make/solaris/makefiles/jsig.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/jsig.make a/hotspot/make/solaris/makefiles/jsig.make --- a~/hotspot/make/solaris/makefiles/jsig.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/jsig.make 1970-01-01 00:00:00 @@ -42,11 +42,16 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfi diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc.patch index 62fb67c8bf..ccfe636580 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc,v 1.1 2 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc a/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc a/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc --- a~/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc 1970-01-01 00:00:00 @@ -0,0 +1,46 @@ diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc.patch index ee055f6741..f09e2a011b 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc,v 1.1 2 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc a/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc a/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc --- a~/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc 1970-01-01 00:00:00 @@ -0,0 +1,49 @@ diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc.patch index 65609122d9..55068bfbc6 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc,v 1.1 2015 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc a/hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc a/hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc --- a~/hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc 1970-01-01 00:00:00 @@ -0,0 +1,48 @@ diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_optimized.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_optimized.make.patch index 55fe00902e..4bee1a4550 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_optimized.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_optimized.make.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_optimized.make,v 1.1 2015/07/03 20 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/optimized.make a/hotspot/make/solaris/makefiles/optimized.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/optimized.make a/hotspot/make/solaris/makefiles/optimized.make --- a~/hotspot/make/solaris/makefiles/optimized.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/optimized.make 1970-01-01 00:00:00 @@ -57,7 +57,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_product.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_product.make.patch index a8ca80807a..24000aabf6 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_product.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_product.make.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_product.make,v 1.1 2015/07/03 20:4 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/product.make a/hotspot/make/solaris/makefiles/product.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/product.make a/hotspot/make/solaris/makefiles/product.make --- a~/hotspot/make/solaris/makefiles/product.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/product.make 1970-01-01 00:00:00 @@ -67,10 +67,16 @@ CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAG diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_saproc.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_saproc.make.patch index e559f6bf05..7d7373e4bd 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_saproc.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_saproc.make.patch @@ -1,7 +1,7 @@ Use illumos libdemangle-sys. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/saproc.make a/hotspot/make/solaris/makefiles/saproc.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/saproc.make a/hotspot/make/solaris/makefiles/saproc.make --- a~/hotspot/make/solaris/makefiles/saproc.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/saproc.make 1970-01-01 00:00:00 @@ -107,7 +107,7 @@ $(LIBSAPROC): $(SASRCFILES) $(SADISOBJ) diff --git a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_vm.make.patch b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_vm.make.patch index a166951181..cb6ab5d6ad 100644 --- a/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_vm.make.patch +++ b/build/openjdk8/patches/patch-hotspot_make_solaris_makefiles_vm.make.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_make_solaris_makefiles_vm.make,v 1.1 2015/07/03 20:40:59 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/vm.make a/hotspot/make/solaris/makefiles/vm.make +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/make/solaris/makefiles/vm.make a/hotspot/make/solaris/makefiles/vm.make --- a~/hotspot/make/solaris/makefiles/vm.make 1970-01-01 00:00:00 +++ a/hotspot/make/solaris/makefiles/vm.make 1970-01-01 00:00:00 @@ -59,7 +59,11 @@ INCLUDES += $(Src_Dirs_I:%=-I%) diff --git a/build/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp.patch index e8e01adbb0..4ced5c6531 100644 --- a/build/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp,v 1.1 2015/02/20 Fix zero build w/ debug enabled -diff -wpruN '--exclude=*.orig' a~/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp a/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp a/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp --- a~/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 1970-01-01 00:00:00 @@ -24,8 +24,8 @@ diff --git a/build/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp.patch index c268fae376..d215860536 100644 --- a/build/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp,v 1.1 2015/02/20 09: Fix zero build w/ debug enabled -diff -wpruN '--exclude=*.orig' a~/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp a/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp a/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp --- a~/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 1970-01-01 00:00:00 @@ -24,6 +24,7 @@ diff --git a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp.patch b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp.patch index 8d09fc4315..5bde651a54 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.h GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp a/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp a/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp --- a~/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp 1970-01-01 00:00:00 +++ a/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp 1970-01-01 00:00:00 @@ -58,6 +58,8 @@ inline void Atomic::dec_ptr(volatile voi diff --git a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp.patch b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp.patch index c7e625e450..0f9a91f683 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inl GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp a/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp a/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp --- a~/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp 1970-01-01 00:00:00 +++ a/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp 1970-01-01 00:00:00 @@ -72,7 +72,11 @@ extern "C" { diff --git a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp.patch index d12b4c674f..5f68ea6f89 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp,v 1.1 20 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp --- a~/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp 1970-01-01 00:00:00 @@ -234,13 +234,43 @@ frame os::get_sender_for_C_frame(frame* diff --git a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp.patch b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp.patch index 750e5aa9c1..e8da51381c 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp.patch @@ -1,4 +1,4 @@ -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp --- a~/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp 1970-01-01 00:00:00 +++ a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp 1970-01-01 00:00:00 @@ -27,8 +27,20 @@ diff --git a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp.patch b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp.patch index 09b51b688e..55c18e9f1c 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp a/hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp a/hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp --- a~/hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp 1970-01-01 00:00:00 +++ a/hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp 1970-01-01 00:00:00 @@ -34,14 +34,28 @@ extern "C" { diff --git a/build/openjdk8/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp.patch index 96616d515f..6c333b9e18 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_os_posix_vm_os__posix.cpp,v 1.3 2015/07/03 20:40:59 f rlim_t fixes. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os/posix/vm/os_posix.cpp a/hotspot/src/os/posix/vm/os_posix.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os/posix/vm/os_posix.cpp a/hotspot/src/os/posix/vm/os_posix.cpp --- a~/hotspot/src/os/posix/vm/os_posix.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/os/posix/vm/os_posix.cpp 1970-01-01 00:00:00 @@ -190,30 +190,30 @@ void os::Posix::print_rlimit_info(output diff --git a/build/openjdk8/patches/patch-hotspot_src_os_solaris_dtrace_jhelper.d.patch b/build/openjdk8/patches/patch-hotspot_src_os_solaris_dtrace_jhelper.d.patch index 3cb1cda7bf..9f7e44606f 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os_solaris_dtrace_jhelper.d.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os_solaris_dtrace_jhelper.d.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_os_solaris_dtrace_jhelper.d,v 1.1 2015/07/03 20:40:59 GCC support. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os/solaris/dtrace/jhelper.d a/hotspot/src/os/solaris/dtrace/jhelper.d +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os/solaris/dtrace/jhelper.d a/hotspot/src/os/solaris/dtrace/jhelper.d --- a~/hotspot/src/os/solaris/dtrace/jhelper.d 1970-01-01 00:00:00 +++ a/hotspot/src/os/solaris/dtrace/jhelper.d 1970-01-01 00:00:00 @@ -43,12 +43,33 @@ diff --git a/build/openjdk8/patches/patch-hotspot_src_os_solaris_proc__Makefile.patch b/build/openjdk8/patches/patch-hotspot_src_os_solaris_proc__Makefile.patch index 4df3faf5a4..fddc9dd3c0 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os_solaris_proc__Makefile.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os_solaris_proc__Makefile.patch @@ -1,7 +1,7 @@ Use illumos libdemangle-sys -diff -wpruN '--exclude=*.orig' a~/hotspot/agent/src/os/solaris/proc/Makefile a/hotspot/agent/src/os/solaris/proc/Makefile +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/agent/src/os/solaris/proc/Makefile a/hotspot/agent/src/os/solaris/proc/Makefile --- a~/hotspot/agent/src/os/solaris/proc/Makefile 1970-01-01 00:00:00 +++ a/hotspot/agent/src/os/solaris/proc/Makefile 1970-01-01 00:00:00 @@ -63,7 +63,7 @@ i386 amd64 sparc sparcv9:: javahomecheck diff --git a/build/openjdk8/patches/patch-hotspot_src_os_solaris_proc__saproc.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_os_solaris_proc__saproc.cpp.patch index 9d46e36937..490544ba9b 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os_solaris_proc__saproc.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os_solaris_proc__saproc.cpp.patch @@ -1,7 +1,7 @@ Use illumos libdemangle-sys -diff -wpruN '--exclude=*.orig' a~/hotspot/agent/src/os/solaris/proc/saproc.cpp a/hotspot/agent/src/os/solaris/proc/saproc.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/agent/src/os/solaris/proc/saproc.cpp a/hotspot/agent/src/os/solaris/proc/saproc.cpp --- a~/hotspot/agent/src/os/solaris/proc/saproc.cpp 1970-01-01 00:00:00 +++ a/hotspot/agent/src/os/solaris/proc/saproc.cpp 1970-01-01 00:00:00 @@ -30,7 +30,7 @@ diff --git a/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp.patch index 1535235a2d..77860c16da 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp.patch @@ -1,7 +1,7 @@ Use illumos libdemangle-sys -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os/solaris/vm/decoder_solaris.cpp a/hotspot/src/os/solaris/vm/decoder_solaris.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os/solaris/vm/decoder_solaris.cpp a/hotspot/src/os/solaris/vm/decoder_solaris.cpp --- a~/hotspot/src/os/solaris/vm/decoder_solaris.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/os/solaris/vm/decoder_solaris.cpp 1970-01-01 00:00:00 @@ -24,9 +24,21 @@ diff --git a/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp.patch index 2c45de6580..dbbe91a508 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_os_solaris_vm_os__solaris.cpp,v 1.1 2015/07/03 20:40: Misc SunOS casts. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os/solaris/vm/os_solaris.cpp a/hotspot/src/os/solaris/vm/os_solaris.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os/solaris/vm/os_solaris.cpp a/hotspot/src/os/solaris/vm/os_solaris.cpp --- a~/hotspot/src/os/solaris/vm/os_solaris.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/os/solaris/vm/os_solaris.cpp 1970-01-01 00:00:00 @@ -113,6 +113,12 @@ diff --git a/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp.patch index d4053e7949..fd2b8106de 100644 --- a/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp,v 1.1 2015/07/0 dirent->dd_fd is legacy, dirent->d_fd is POSIX, dirfd(dirent) is better. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp a/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp a/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp --- a~/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp 1970-01-01 00:00:00 @@ -334,7 +334,7 @@ static DIR *open_directory_secure(const diff --git a/build/openjdk8/patches/patch-hotspot_src_share_vm_oops_klass.hpp.patch b/build/openjdk8/patches/patch-hotspot_src_share_vm_oops_klass.hpp.patch index 83210a75c1..53074a915d 100644 --- a/build/openjdk8/patches/patch-hotspot_src_share_vm_oops_klass.hpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_share_vm_oops_klass.hpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_share_vm_oops_klass.hpp,v 1.1 2015/09/12 16:56:48 joe Left shift of negative values is UB. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/share/vm/oops/klass.hpp a/hotspot/src/share/vm/oops/klass.hpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/share/vm/oops/klass.hpp a/hotspot/src/share/vm/oops/klass.hpp --- a~/hotspot/src/share/vm/oops/klass.hpp 1970-01-01 00:00:00 +++ a/hotspot/src/share/vm/oops/klass.hpp 1970-01-01 00:00:00 @@ -358,11 +358,11 @@ protected: diff --git a/build/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp.patch index 0074200965..7a232ab79a 100644 --- a/build/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_share_vm_opto_library__call.cpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_share_vm_opto_library__call.cpp,v 1.1 2015/09/12 16:5 Left shift of negative values is UB. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/share/vm/opto/library_call.cpp a/hotspot/src/share/vm/opto/library_call.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/share/vm/opto/library_call.cpp a/hotspot/src/share/vm/opto/library_call.cpp --- a~/hotspot/src/share/vm/opto/library_call.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/share/vm/opto/library_call.cpp 1970-01-01 00:00:00 @@ -3845,7 +3845,7 @@ Node* LibraryCallKit::generate_array_gua diff --git a/build/openjdk8/patches/patch-hotspot_src_share_vm_opto_node.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_share_vm_opto_node.cpp.patch index 8d2a240e02..1ceb383496 100644 --- a/build/openjdk8/patches/patch-hotspot_src_share_vm_opto_node.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_share_vm_opto_node.cpp.patch @@ -1,6 +1,6 @@ $NetBSD: patch-hotspot_src_share_vm_opto_node.cpp,v 1.1 2015/02/08 08:41:25 tnn Exp $ -diff -wpruN '--exclude=*.orig' a~/hotspot/src/share/vm/opto/node.cpp a/hotspot/src/share/vm/opto/node.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/share/vm/opto/node.cpp a/hotspot/src/share/vm/opto/node.cpp --- a~/hotspot/src/share/vm/opto/node.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/share/vm/opto/node.cpp 1970-01-01 00:00:00 @@ -291,6 +291,10 @@ void DUIterator_Last::verify_step(uint n diff --git a/build/openjdk8/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp.patch index d41f54b72e..57b36863d5 100644 --- a/build/openjdk8/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp.patch @@ -6,7 +6,7 @@ than 16GB, e.g. due to process limits, scale this down. Even unused pages waste system resources and the default limit can stop the JVM from starting with ulimit -v 2G. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/share/vm/runtime/arguments.cpp a/hotspot/src/share/vm/runtime/arguments.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/share/vm/runtime/arguments.cpp a/hotspot/src/share/vm/runtime/arguments.cpp --- a~/hotspot/src/share/vm/runtime/arguments.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/share/vm/runtime/arguments.cpp 1970-01-01 00:00:00 @@ -1887,6 +1887,12 @@ void Arguments::set_heap_size() { diff --git a/build/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp.patch b/build/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp.patch index c1f693de01..d94dba60cc 100644 --- a/build/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp.patch @@ -1,6 +1,6 @@ $NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.4 2016/08/15 19:09:38 ryoon Exp $ -diff -wpruN '--exclude=*.orig' a~/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp --- a~/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 1970-01-01 00:00:00 +++ a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 1970-01-01 00:00:00 @@ -68,7 +68,7 @@ diff --git a/build/openjdk8/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp.patch b/build/openjdk8/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp.patch index b5fec53f4c..2ae5c73dbc 100644 --- a/build/openjdk8/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp.patch +++ b/build/openjdk8/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp.patch @@ -2,7 +2,7 @@ $NetBSD: patch-hotspot_src_share_vm_utilities_hashtable.cpp,v 1.1 2015/07/03 20: Delete obsolete (and now harmful) SunOS code. -diff -wpruN '--exclude=*.orig' a~/hotspot/src/share/vm/utilities/hashtable.cpp a/hotspot/src/share/vm/utilities/hashtable.cpp +diff -wpruN --no-dereference '--exclude=*.orig' a~/hotspot/src/share/vm/utilities/hashtable.cpp a/hotspot/src/share/vm/utilities/hashtable.cpp --- a~/hotspot/src/share/vm/utilities/hashtable.cpp 1970-01-01 00:00:00 +++ a/hotspot/src/share/vm/utilities/hashtable.cpp 1970-01-01 00:00:00 @@ -391,7 +391,7 @@ template class RehashableHashtable$ -diff -wpruN '--exclude=*.orig' a~/jdk/src/share/classes/sun/security/jca/ProviderConfig.java a/jdk/src/share/classes/sun/security/jca/ProviderConfig.java +diff -wpruN --no-dereference '--exclude=*.orig' a~/jdk/src/share/classes/sun/security/jca/ProviderConfig.java a/jdk/src/share/classes/sun/security/jca/ProviderConfig.java --- a~/jdk/src/share/classes/sun/security/jca/ProviderConfig.java 1970-01-01 00:00:00 +++ a/jdk/src/share/classes/sun/security/jca/ProviderConfig.java 1970-01-01 00:00:00 @@ -102,15 +102,14 @@ final class ProviderConfig { From 6064188a7a04d286dc4b7bf897875029ad3f664d Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 25 Jan 2024 17:52:42 +0000 Subject: [PATCH 2/3] openjdk11: update from 11.0.21+9 to 11.0.22+7 --- build/openjdk11/build.sh | 4 ++-- build/openjdk11/patches/omnios-headless.patch | 2 +- .../openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk | 2 +- build/openjdk11/patches/security-pkcs11.patch | 4 ++-- build/openjdk11/patches/tribblix-thrstat001.patch | 9 +++++---- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build/openjdk11/build.sh b/build/openjdk11/build.sh index 25211820ab..c46fd9fa37 100755 --- a/build/openjdk11/build.sh +++ b/build/openjdk11/build.sh @@ -12,12 +12,12 @@ # http://www.illumos.org/license/CDDL. # }}} # -# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/functions.sh PROG=openjdk -VER=11.0.21+9 +VER=11.0.22+7 PKG=runtime/java/openjdk11 SUMMARY="openjdk ${VER%%.*}" DESC="Open-source implementation of the eleventh edition of the " diff --git a/build/openjdk11/patches/omnios-headless.patch b/build/openjdk11/patches/omnios-headless.patch index e2bd1b4738..5455787a72 100644 --- a/build/openjdk11/patches/omnios-headless.patch +++ b/build/openjdk11/patches/omnios-headless.patch @@ -1,7 +1,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/make/lib/Awt2dLibraries.gmk a/make/lib/Awt2dLibraries.gmk --- a~/make/lib/Awt2dLibraries.gmk 1970-01-01 00:00:00 +++ a/make/lib/Awt2dLibraries.gmk 1970-01-01 00:00:00 -@@ -735,11 +735,9 @@ else # not windows +@@ -740,11 +740,9 @@ else # not windows JAWT_LIBS += -lawt_xawt else JAWT_LIBS += -lawt_headless diff --git a/build/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk b/build/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk index 89425b4854..59dab4cb2a 100644 --- a/build/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk +++ b/build/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk @@ -13,7 +13,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/make/lib/Awt2dLibraries.gmk a CFLAGS_windows := -DCMS_IS_WINDOWS_, \ EXTRA_HEADER_DIRS := \ common/awt/debug \ -@@ -554,8 +553,12 @@ else +@@ -557,8 +556,12 @@ else HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY endif ifeq ($(call isTargetOs, solaris), true) diff --git a/build/openjdk11/patches/security-pkcs11.patch b/build/openjdk11/patches/security-pkcs11.patch index bdd1fe8002..f8c849050f 100644 --- a/build/openjdk11/patches/security-pkcs11.patch +++ b/build/openjdk11/patches/security-pkcs11.patch @@ -1,7 +1,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/src/java.base/share/conf/security/java.security a/src/java.base/share/conf/security/java.security --- a~/src/java.base/share/conf/security/java.security 1970-01-01 00:00:00 +++ a/src/java.base/share/conf/security/java.security 1970-01-01 00:00:00 -@@ -62,7 +62,6 @@ +@@ -65,7 +65,6 @@ # #ifdef solaris security.provider.tbd=OracleUcrypto @@ -9,7 +9,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/src/java.base/share/conf/secu #endif security.provider.tbd=SUN security.provider.tbd=SunRsaSign -@@ -83,6 +82,8 @@ security.provider.tbd=Apple +@@ -86,6 +85,8 @@ security.provider.tbd=Apple #endif #ifndef solaris security.provider.tbd=SunPKCS11 diff --git a/build/openjdk11/patches/tribblix-thrstat001.patch b/build/openjdk11/patches/tribblix-thrstat001.patch index 82bf9e86bf..1ba590b148 100644 --- a/build/openjdk11/patches/tribblix-thrstat001.patch +++ b/build/openjdk11/patches/tribblix-thrstat001.patch @@ -1,8 +1,9 @@ Local definition of wait() conflicts with wait(3C). ---- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp Fri Oct 6 06:33:33 2023 -+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp Thu Oct 19 09:25:58 2023 -@@ -70,7 +70,7 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp +--- a~/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp 1970-01-01 00:00:00 ++++ a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp 1970-01-01 00:00:00 +@@ -70,7 +70,7 @@ unlock(const char* func_name, jrawMonito } static void @@ -11,7 +12,7 @@ Local definition of wait() conflicts with wait(3C). jvmtiError err = jvmti->RawMonitorWait(lock, (jlong)millis); if (err != JVMTI_ERROR_NONE) { printf("%s: unexpected error in RawMonitorWait: %s (%d)\n", -@@ -229,7 +229,7 @@ +@@ -229,7 +229,7 @@ Java_nsk_jvmti_GetThreadState_thrstat001 break; } lock("checkStatus", wait_lock); From 0c65840de89d2e8ef516acac458690c72a3e02d7 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 25 Jan 2024 17:53:28 +0000 Subject: [PATCH 3/3] openjdk17: update from 17.0.9+9 17.0.10+7 --- build/openjdk17/build.sh | 2 +- build/openjdk17/patches/illumos-port-18.patch | 33 +++++++++++++++++++ .../patches/java-solaris-sparc.patch | 8 ++--- build/openjdk17/patches/series | 1 + 4 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 build/openjdk17/patches/illumos-port-18.patch diff --git a/build/openjdk17/build.sh b/build/openjdk17/build.sh index b602426f60..04a2d96f4f 100755 --- a/build/openjdk17/build.sh +++ b/build/openjdk17/build.sh @@ -17,7 +17,7 @@ . ../../lib/functions.sh PROG=openjdk -VER=17.0.9+9 +VER=17.0.10+7 PKG=runtime/java/openjdk17 SUMMARY="openjdk ${VER%%.*}" DESC="Open-source implementation of the seventeenth edition of the " diff --git a/build/openjdk17/patches/illumos-port-18.patch b/build/openjdk17/patches/illumos-port-18.patch new file mode 100644 index 0000000000..f8bcb293f4 --- /dev/null +++ b/build/openjdk17/patches/illumos-port-18.patch @@ -0,0 +1,33 @@ +While we do have stafs(2) it has a different signature, is deprecated and +undocumented, while statvfs() gives the behaviour we actually want. + +--- a/test/jdk/java/io/File/libGetXSpace.c Wed Apr 5 22:54:38 2023 ++++ b/test/jdk/java/io/File/libGetXSpace.c Thu Apr 6 14:28:43 2023 +@@ -34,9 +34,13 @@ + #include + #include + #else ++#ifdef __sun__ ++#include ++#else + #include + #endif + #endif ++#endif + + #ifdef __cplusplus + extern "C" { +@@ -142,8 +146,13 @@ + chars[len] = '\0'; + (*env)->ReleaseStringChars(env, root, strchars); + ++#ifdef __sun__ ++ struct statvfs buf; ++ int result = statvfs((const char*)chars, &buf); ++#else + struct statfs buf; + int result = statfs((const char*)chars, &buf); ++#endif + free(chars); + if (result < 0) { + JNU_ThrowByNameWithLastError(env, "java/lang/RuntimeException", diff --git a/build/openjdk17/patches/java-solaris-sparc.patch b/build/openjdk17/patches/java-solaris-sparc.patch index 3b954f458c..81cf6d155c 100644 --- a/build/openjdk17/patches/java-solaris-sparc.patch +++ b/build/openjdk17/patches/java-solaris-sparc.patch @@ -988,11 +988,11 @@ @@ -36,7 +36,6 @@ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LIBS := -ljava, \ + LIBS_unix := -ljava, \ - LIBS_solaris := -lsocket, \ LIBS_linux := -ljvm, \ + LIBS_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB), \ )) - --- old/make/modules/jdk.sctp/Lib.gmk 2020-05-20 17:59:26.921438651 -0700 +++ new/make/modules/jdk.sctp/Lib.gmk 2020-05-20 17:59:26.541431354 -0700 @@ -44,7 +44,6 @@ @@ -1488,10 +1488,10 @@ - -#define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \ +#define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail) ? \ - NativeCallStack(0) : NativeCallStack::empty_stack()) + NativeCallStack(0) : FAKE_CALLSTACK) -#define CALLER_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \ +#define CALLER_PC ((MemTracker::tracking_level() == NMT_detail) ? \ - NativeCallStack(1) : NativeCallStack::empty_stack()) + NativeCallStack(1) : FAKE_CALLSTACK) class MemBaseline; --- old/src/hotspot/share/utilities/debug.cpp 2020-05-20 18:00:41.782876045 -0700 diff --git a/build/openjdk17/patches/series b/build/openjdk17/patches/series index c6d836b829..85d3f456a4 100644 --- a/build/openjdk17/patches/series +++ b/build/openjdk17/patches/series @@ -16,6 +16,7 @@ illumos-port-14.patch illumos-port-15.patch illumos-port-16.patch illumos-port-17.patch +illumos-port-18.patch illumos-signal-1.patch illumos-signal-2.patch illumos-signal-3.patch