--- a/make/lib/Lib-java.base.gmk	Wed Mar 28 21:57:03 2018 -0700
+++ b/make/lib/Lib-java.base.gmk	Thu Mar 29 08:52:41 2018 -0700
@@ -159,6 +159,7 @@
   ifeq ($(STATIC_BUILD), false)
 
     LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjsig
+    LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS))
 
     ifeq ($(OPENJDK_TARGET_OS), linux)
       # FIXME: This is probably not what we want to do, but keep it now for compatibility.
@@ -174,6 +175,7 @@
         LIBS_linux := $(LIBDL), \
         LIBS_solaris := $(LIBDL), \
         LIBS_aix := $(LIBDL), \
+        MAPFILE := $(LIBJSIG_MAPFILE), \
     ))
 
     TARGETS += $(BUILD_LIBJSIG)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/mapfiles/libjsig/mapfile-vers-solaris	Thu Mar 29 08:52:41 2018 -0700
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#  
+#
+
+# Define library interface.
+
+SUNWprivate_1.1 {
+        global:
+            JVM_begin_signal_setting;
+            JVM_end_signal_setting;
+            JVM_get_libjsig_version;
+            JVM_get_signal_action;
+            sigaction;
+            signal;
+            sigset;
+        local:
+                *;
+};

--- a/src/java.base/solaris/native/libjsig/jsig.c	Wed Mar 28 21:57:03 2018 -0700
+++ b/src/java.base/solaris/native/libjsig/jsig.c	Thu Mar 29 08:52:41 2018 -0700
@@ -177,13 +177,11 @@
   }
 }
 
-JNIEXPORT sa_handler_t JNICALL
-signal(int sig, sa_handler_t disp) {
+sa_handler_t signal(int sig, sa_handler_t disp) {
   return set_signal(sig, disp, false);
 }
 
-JNIEXPORT sa_handler_t JNICALL
-sigset(int sig, sa_handler_t disp) {
+sa_handler_t sigset(int sig, sa_handler_t disp) {
   return set_signal(sig, disp, true);
 }
 
@@ -199,8 +197,7 @@
   return (*os_sigaction)(sig, act, oact);
 }
 
-JNIEXPORT int JNICALL
-sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
+int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
   int res;
   struct sigaction oldAct;