Merge pull request #3455 from citrus-it/openjdk

openjdk updates

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/build.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 "

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

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)

build/openjdk11/patches/security-pkcs11.patch

@@ -1,15 +1,15 @@
 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
 -security.provider.tbd=SunPKCS11 ${java.home}/conf/security/sunpkcs11-solaris.cfg
  #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

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);

build/openjdk17/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.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 "

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 <sys/param.h>
+ #include <sys/mount.h>
+ #else
++#ifdef __sun__
++#include <sys/statvfs.h>
++#else
+ #include <sys/statfs.h>
+ #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",

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

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

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"
 

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, \

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

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

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.*;

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

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

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,15 +10,15 @@ 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
 +  JVM_MAX_HEAP=800M
 
    $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

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

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

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 @@

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

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 @@

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

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)

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

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 @@

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 @@