--- old/make/lib/Lib-jdk.security.auth.gmk	2018-03-23 14:24:07.813158093 +0100
+++ new/make/lib/Lib-jdk.security.auth.gmk	2018-03-23 14:24:07.589158094 +0100
@@ -27,18 +27,17 @@
 
 ################################################################################
 
-LIBJAAS_MAPFILE :=
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-  # only on solaris...wonder why
-  LIBJAAS_MAPFILE := $(TOPDIR)/make/mapfiles/libjaas/mapfile-vers
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+  # FIXME: We should not really do this, but keep for now for compatibility.
+  LIBJAAS_CFLAGS := $(EXPORT_ALL_SYMBOLS)
 endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
     NAME := jaas, \
     SRC := $(call FindSrcDirsForLib, jdk.security.auth, jaas), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.security.auth, \
-    MAPFILE := $(LIBJAAS_MAPFILE), \
+    CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.security.auth \
+        $(LIBJAAS_CFLAGS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib $(JDKLIB_LIBS), \