changeset 13547:a5fd610da7d1

Build system support for BSD Authored by: Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com>
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 16 Apr 2016 16:21:10 -0700
parents 38cd01bdfd45
children ef9e5cf5e179
files make/data/charsetmapping/stdcs-aix make/data/charsetmapping/stdcs-bsd make/launcher/Launcher-jdk.pack200.gmk make/launcher/LauncherCommon.gmk make/lib/Awt2dLibraries.gmk make/lib/CoreLibraries.gmk make/lib/Lib-java.instrument.gmk make/lib/Lib-jdk.jdwp.agent.gmk make/lib/Lib-jdk.sctp.gmk make/lib/SoundLibraries.gmk make/mapfiles/libattach/mapfile-bsd make/mapfiles/libattach/mapfile-linux
diffstat 12 files changed, 127 insertions(+), 106 deletions(-) [+]
line wrap: on
line diff
--- a/make/data/charsetmapping/stdcs-aix	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/data/charsetmapping/stdcs-aix	Sat Apr 16 16:21:10 2016 -0700
@@ -1,6 +0,0 @@
-#
-#   generate these charsets into sun.nio.cs
-#
-EUC_CN
-EUC_KR
-GBK
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/charsetmapping/stdcs-bsd	Sat Apr 16 16:21:10 2016 -0700
@@ -0,0 +1,6 @@
+#
+#   generate these charsets into sun.nio.cs
+#
+EUC_CN
+EUC_KR
+GBK
--- a/make/launcher/Launcher-jdk.pack200.gmk	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/launcher/Launcher-jdk.pack200.gmk	Sat Apr 16 16:21:10 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -72,7 +72,7 @@
   UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200.anonymous
 else ifneq ($(wildcard $(UNPACK_MAPFILE_PLATFORM_FILE)), )
   UNPACK_MAPFILE := $(UNPACK_MAPFILE_PLATFORM_FILE)
-else
+else ifneq ($(OPENJDK_TARGET_OS), bsd)
   UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200
 endif
 
--- a/make/launcher/LauncherCommon.gmk	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/launcher/LauncherCommon.gmk	Sat Apr 16 16:21:10 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -122,7 +122,7 @@
           -framework CoreFoundation \
           -framework Foundation \
           -framework SystemConfiguration \
-          -lstdc++ -liconv
+          -lstdc++ $(ICONV_LIBS)
     else
       $1_LIBS += $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a
     endif
@@ -135,6 +135,15 @@
     $1_LIBS += -ljli_static
   endif
 
+  ifeq ($(OPENJDK_TARGET_OS), bsd)
+    ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.netbsd)
+      $1_LDFLAGS += -L$(SUPPORT_OUTPUTDIR)/native/java.base
+      $1_LIBS += -ljli_static
+    else
+      $1_LIBS += -ljli
+    endif
+  endif
+
   ifeq ($(USE_EXTERNAL_LIBZ), true)
     $1_LIBS += -lz
   endif
@@ -150,17 +159,16 @@
   # The linker on older SuSE distros (e.g. on SLES 10) complains with:
   # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
   # if feeded with a version script which contains named tags.
+  $1_MAPFILE :=
   ifeq ($(USING_BROKEN_SUSE_LD),yes)
     ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous), )
       $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous
-    else
-      $1_MAPFILE :=
     endif
   else
-    ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), )
-      $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
-    else
-      $1_MAPFILE :=
+    ifneq ($(OPENJDK_TARGET_OS), bsd)
+      ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), )
+        $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
+      endif
     endif
   endif
 
@@ -183,11 +191,14 @@
           -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \
       LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
           -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \
+      LDFLAGS_bsd := \
+          -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \
       MAPFILE := $$($1_MAPFILE), \
       LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \
       LIBS_unix := $$($1_LIBS_unix), \
       LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \
       LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \
+      LIBS_bsd := -lpthread, \
       LIBS_windows := $$($1_WINDOWS_JLI_LIB) \
           $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib advapi32.lib \
           $$($1_LIBS_windows), \
--- a/make/lib/Awt2dLibraries.gmk	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/lib/Awt2dLibraries.gmk	Sat Apr 16 16:21:10 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -160,7 +160,7 @@
   LIBAWT_EXFILES := java2d/ShaderList.c
 endif
 
-ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
+ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix bsd), )
   LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
 endif
 
@@ -201,6 +201,10 @@
   LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
 endif
 
+ifeq ($(OPENJDK_TARGET_OS), bsd)
+  LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt
+endif
+
 ifeq ($(OPENJDK_TARGET_OS), windows)
   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
@@ -354,9 +358,11 @@
         DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
             deprecated-declarations unused-result maybe-uninitialized format \
             format-security int-to-pointer-cast parentheses, \
+        DISABLED_WARNINGS_clang := deprecated-declarations format parentheses int-conversion, \
         DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
             E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
         WARNINGS_AS_ERRORS_gcc := false, \
+        WARNINGS_AS_ERRORS_clang := false, \
         MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN) \
@@ -610,7 +616,7 @@
   HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
                       -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H
 endif
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), linux macosx))
+ifneq (, $(findstring $(OPENJDK_TARGET_OS), linux macosx bsd))
   HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
 endif
 ifeq ($(OPENJDK_TARGET_OS), solaris)
@@ -858,7 +864,7 @@
 
   LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
       $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
-      $(LIBJAVA_HEADER_FLAGS) \
+      $(LIBJAVA_HEADER_FLAGS) $(ICONV_CFLAGS) \
       #
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
@@ -889,7 +895,7 @@
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     LIBSPLASHSCREEN_LDFLAGS := -L$(INSTALL_LIBRARIES_HERE)
     LIBSPLASHSCREEN_LIBS += \
-        $(LIBM) -lpthread -liconv -losxapp \
+        $(LIBM) -lpthread $(ICONV_LIBS) -losxapp \
         -framework ApplicationServices \
         -framework Foundation \
         -framework Cocoa \
@@ -920,7 +926,7 @@
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ) \
                         $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \
-      LIBS_aix := -liconv, \
+      LIBS_aix := $(ICONV_LIBS), \
       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       RC_FLAGS := $(RC_FLAGS) \
           -D "JDK_FNAME=splashscreen.dll" \
--- a/make/lib/CoreLibraries.gmk	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/lib/CoreLibraries.gmk	Sat Apr 16 16:21:10 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -269,7 +269,7 @@
         -export:JIMAGE_PackageToModule \
         -export:JIMAGE_FindResource -export:JIMAGE_GetResource \
         -export:JIMAGE_ResourceIterator, \
-    LIBS_unix := -ljvm -ldl $(LIBCXX), \
+    LIBS_unix := -ljvm $(LIBDL) $(LIBCXX), \
     LIBS_solaris := -lc, \
     LIBS_macosx := -lc++, \
     LIBS_windows := jvm.lib, \
@@ -443,8 +443,9 @@
     TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a
   endif
 
-else ifeq ($(OPENJDK_TARGET_OS), aix)
-  # AIX also requires a static libjli because the compiler doesn't support '-rpath'
+else ifneq ($(filter $(OPENJDK_TARGET_OS_ENV), aix bsd.netbsd), )
+  # AIX and NetBSD also requires a static libjli because the compiler doesn't
+  # support '-rpath'
   $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
       STATIC_LIBRARY := jli_static, \
       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
--- a/make/lib/Lib-java.instrument.gmk	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/lib/Lib-java.instrument.gmk	Sat Apr 16 16:21:10 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -38,6 +38,7 @@
     -I$(SUPPORT_OUTPUTDIR)/headers/java.instrument \
     -I$(JDK_TOPDIR)/src/java.base/share/native/libjli \
     -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
+    $(ICONV_CFLAGS) \
     #
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -72,8 +73,8 @@
     LIBS_unix := -ljava $(LIBZ), \
     LIBS_linux := -ljli $(LIBDL), \
     LIBS_solaris := -ljli $(LIBDL), \
-    LIBS_aix := -liconv -ljli_static $(LIBDL), \
-    LIBS_macosx := -liconv -framework Cocoa -framework Security \
+    LIBS_aix := $(ICONV_LIBS) -ljli_static $(LIBDL), \
+    LIBS_macosx := $(ICONV_LIBS) -framework Cocoa -framework Security \
         -framework ApplicationServices \
         $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a, \
     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib \
--- a/make/lib/Lib-jdk.jdwp.agent.gmk	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/lib/Lib-jdk.jdwp.agent.gmk	Sat Apr 16 16:21:10 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -79,7 +79,7 @@
     SRC := $(LIBJDWP_SRC), \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
-        $(LIBJDWP_CPPFLAGS) \
+        $(LIBJDWP_CPPFLAGS) $(ICONV_CFLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -87,8 +87,8 @@
     LIBS := $(JDKLIB_LIBS), \
     LIBS_linux := $(LIBDL), \
     LIBS_solaris := $(LIBDL), \
-    LIBS_macosx := -liconv, \
-    LIBS_aix := -liconv, \
+    LIBS_macosx := $(ICONV_LIBS), \
+    LIBS_aix := $(ICONV_LIBS), \
     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
     RC_FLAGS := $(RC_FLAGS) \
         -D "JDK_FNAME=jdwp.dll" \
--- a/make/lib/Lib-jdk.sctp.gmk	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/lib/Lib-jdk.sctp.gmk	Sat Apr 16 16:21:10 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -27,38 +27,36 @@
 
 ################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
+ifneq ($(filter $(OPENJDK_TARGET_OS), linux solaris), )
+  # DISABLED_WARNINGS_gcc := unused-parameter needed to
+  # suppress unused parameters required by exported JNI functions.
 
-  ifeq (, $(filter $(OPENJDK_TARGET_OS), macosx aix))
-    # DISABLED_WARNINGS_gcc := unused-parameter needed to
-    # suppress unused parameters required by exported JNI functions.
+  $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
+      LIBRARY := sctp, \
+      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+      SRC := $(JDK_TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_TYPE)/native/libsctp, \
+      OPTIMIZATION := LOW, \
+      CFLAGS := $(CFLAGS_JDKLIB) \
+          -I $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
+          -I $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \
+          $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \
+          $(LIBJAVA_HEADER_FLAGS) \
+          -I$(SUPPORT_OUTPUTDIR)/headers/jdk.sctp \
+          -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
+      DISABLED_WARNINGS_gcc := unused-parameter, \
+      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \
+      LDFLAGS := $(LDFLAGS_JDKLIB) \
+          $(call SET_SHARED_LIBRARY_ORIGIN), \
+      LIBS_unix := -lnio -lnet -ljava -ljvm, \
+      LIBS_linux := -lpthread $(LIBDL), \
+      LIBS_solaris := -lsocket -lc, \
+      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \
+  ))
 
-    $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
-        LIBRARY := sctp, \
-        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-        SRC := $(JDK_TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_TYPE)/native/libsctp, \
-        OPTIMIZATION := LOW, \
-        CFLAGS := $(CFLAGS_JDKLIB) \
-            -I $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
-            -I $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \
-            $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \
-            $(LIBJAVA_HEADER_FLAGS) \
-            -I$(SUPPORT_OUTPUTDIR)/headers/jdk.sctp \
-            -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
-        DISABLED_WARNINGS_gcc := unused-parameter, \
-        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \
-        LDFLAGS := $(LDFLAGS_JDKLIB) \
-            $(call SET_SHARED_LIBRARY_ORIGIN), \
-        LIBS_unix := -lnio -lnet -ljava -ljvm, \
-        LIBS_linux := -lpthread $(LIBDL), \
-        LIBS_solaris := -lsocket -lc, \
-        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \
-    ))
 
-    TARGETS += $(BUILD_LIBSCTP)
+  TARGETS += $(BUILD_LIBSCTP)
 
-    $(BUILD_LIBSCTP): $(call FindLib, java.base, nio)
-  endif
+  $(BUILD_LIBSCTP): $(call FindLib, java.base, nio)
 endif
 
 ################################################################################
--- a/make/lib/SoundLibraries.gmk	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/lib/SoundLibraries.gmk	Sat Apr 16 16:21:10 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -78,6 +78,10 @@
   LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX
 endif # OPENJDK_TARGET_OS aix
 
+ifeq ($(OPENJDK_TARGET_OS), bsd)
+  LIBJSOUND_CFLAGS += -DX_PLATFORM=X_BSD
+endif # OPENJDK_TARGET_OS bsd
+
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX
   LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/mapfiles/libattach/mapfile-bsd	Sat Apr 16 16:21:10 2016 -0700
@@ -0,0 +1,43 @@
+#
+# 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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 public interface.
+
+SUNWprivate_1.1 {
+	global:
+	    Java_sun_tools_attach_VirtualMachineImpl_checkPermissions;
+	    Java_sun_tools_attach_VirtualMachineImpl_close;
+	    Java_sun_tools_attach_VirtualMachineImpl_connect;
+	    Java_sun_tools_attach_VirtualMachineImpl_getLinuxThreadsManager;
+	    Java_sun_tools_attach_VirtualMachineImpl_isLinuxThreads;
+	    Java_sun_tools_attach_VirtualMachineImpl_open;
+	    Java_sun_tools_attach_VirtualMachineImpl_sendQuitTo;
+            Java_sun_tools_attach_VirtualMachineImpl_sendQuitToChildrenOf;
+	    Java_sun_tools_attach_VirtualMachineImpl_socket;
+	    Java_sun_tools_attach_VirtualMachineImpl_read;
+	    Java_sun_tools_attach_VirtualMachineImpl_write;
+	local:
+		*;
+};
--- a/make/mapfiles/libattach/mapfile-linux	Thu Jan 28 09:43:08 2016 -0800
+++ b/make/mapfiles/libattach/mapfile-linux	Sat Apr 16 16:21:10 2016 -0700
@@ -1,43 +0,0 @@
-#
-# 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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 public interface.
-
-SUNWprivate_1.1 {
-	global:
-	    Java_sun_tools_attach_VirtualMachineImpl_checkPermissions;
-	    Java_sun_tools_attach_VirtualMachineImpl_close;
-	    Java_sun_tools_attach_VirtualMachineImpl_connect;
-	    Java_sun_tools_attach_VirtualMachineImpl_getLinuxThreadsManager;
-	    Java_sun_tools_attach_VirtualMachineImpl_isLinuxThreads;
-	    Java_sun_tools_attach_VirtualMachineImpl_open;
-	    Java_sun_tools_attach_VirtualMachineImpl_sendQuitTo;
-            Java_sun_tools_attach_VirtualMachineImpl_sendQuitToChildrenOf;
-	    Java_sun_tools_attach_VirtualMachineImpl_socket;
-	    Java_sun_tools_attach_VirtualMachineImpl_read;
-	    Java_sun_tools_attach_VirtualMachineImpl_write;
-	local:
-		*;
-};