--- a/make/hotspot/lib/CompileLibjsig.gmk	Tue Feb 13 14:54:44 2018 +0100
+++ b/make/hotspot/lib/CompileLibjsig.gmk	Tue Feb 13 15:14:11 2018 +0100
@@ -57,7 +57,7 @@
       endif
 
     else ifeq ($(OPENJDK_TARGET_OS), solaris)
-      LIBJSIG_CFLAGS := -fvisibility=hidden -m64 -KPIC -mt -I $(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include
+      LIBJSIG_CFLAGS := -xldscope=hidden -m64 -KPIC -mt -I $(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include
       LIBJSIG_LDFLAGS := -m64 -mt -xnolib
       LIBJSIG_LIBS := $(LIBDL)
 

--- a/src/java.base/share/native/libzip/zip_util.h	Tue Feb 13 14:54:44 2018 +0100
+++ b/src/java.base/share/native/libzip/zip_util.h	Tue Feb 13 15:14:11 2018 +0100
@@ -273,7 +273,7 @@
 void ZIP_Unlock(jzfile *zip);
 jint ZIP_Read(jzfile *zip, jzentry *entry, jlong pos, void *buf, jint len);
 JNIEXPORT void JNICALL
-JNIEXPORT ZIP_FreeEntry(jzfile *zip, jzentry *ze);
+ZIP_FreeEntry(jzfile *zip, jzentry *ze);
 jlong ZIP_GetEntryDataOffset(jzfile *zip, jzentry *entry);
 jzentry * ZIP_GetEntry2(jzfile *zip, char *name, jint ulen, jboolean addSlash);
 

--- a/src/java.base/solaris/native/libjsig/jsig.c	Tue Feb 13 14:54:44 2018 +0100
+++ b/src/java.base/solaris/native/libjsig/jsig.c	Tue Feb 13 15:14:11 2018 +0100
@@ -30,6 +30,8 @@
  * Used for signal-chaining. See RFE 4381843.
  */
 
+#define JNIEXPORT 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -37,9 +39,12 @@
 #include <dlfcn.h>
 #include <thread.h>
 #include <synch.h>
-#incldue "jni.h"
+#include "jni.h"
 #include "jvm_md.h"
 
+// FIXME
+#define JNIEXPORT 
+
 #define bool int
 #define true 1
 #define false 0

--- a/src/java.base/unix/native/include/jni_md.h	Tue Feb 13 14:54:44 2018 +0100
+++ b/src/java.base/unix/native/include/jni_md.h	Tue Feb 13 15:14:11 2018 +0100
@@ -38,8 +38,13 @@
     #define JNIIMPORT     __attribute__((visibility("default")))
   #endif
 #else
-  #define JNIEXPORT
-  #define JNIIMPORT
+  #if (defined(__SUNPRO_C) || defined(__SUNPRO_CC))
+    #define JNIEXPORT     __attribute__((visibility("default")))
+    #define JNIIMPORT     __attribute__((visibility("default")))
+  #else
+    #define JNIEXPORT
+    #define JNIIMPORT
+  #endif
 #endif
 
 #define JNICALL