--- common/autoconf/generated-configure.sh	2020-01-17 14:33:00.020753356 +0000
+++ common/autoconf/generated-configure.sh	2020-01-17 15:04:26.883173398 +0000
@@ -41584,6 +41582,8 @@
   elif test "x$TOOLCHAIN_TYPE" = xgcc; then
     LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
     LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
+    LDFLAGS_JDK="$LDFLAGS_JDK -lssp"
+    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -lssp"
     if test "x$OPENJDK_TARGET_OS" != xmacosx -a test "x$OPENJDK_TARGET_OS" != xsolaris; then
       LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
       LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
--- hotspot/make/solaris/makefiles/vm.make.1	2020-01-17 17:35:30.467588973 +0000
+++ hotspot/make/solaris/makefiles/vm.make	2020-01-17 17:35:47.281060024 +0000
@@ -148,6 +148,8 @@
 
 LIBS += -lkstat
 
+LIBS += -lssp
+
 # By default, link the *.o into the library, not the executable.
 LINK_INTO$(LINK_INTO) = LIBJVM