--- old/make/common/NativeCompilation.gmk	2015-04-13 15:23:10.392274670 +0200
+++ new/make/common/NativeCompilation.gmk	2015-04-13 15:23:10.300270802 +0200
@@ -70,6 +70,7 @@
     -e 's/\#.*//' \
     -e 's/^[^:]*: *//' \
     -e 's/ *\\$$$$//' \
+    -e 's/^[	 ]*//' \
     -e '/^$$$$/ d' \
     -e 's/$$$$/ :/' \
     #
--- old/jdk/make/launcher/Launcher-jdk.pack200.gmk	2015-04-13 15:23:10.948298048 +0200
+++ new/jdk/make/launcher/Launcher-jdk.pack200.gmk	2015-04-13 15:23:10.728288798 +0200
@@ -61,13 +61,19 @@
   UNPACKEXE_LANG := C++
 endif
 
+UNPACK_MAPFILE_DIR := $(JDK_TOPDIR)/make/mapfiles/libunpack
+UNPACK_MAPFILE_PLATFORM_FILE := \
+    $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH)
+
 # 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.
 ifeq ($(USING_BROKEN_SUSE_LD), yes)
-  UNPACK_MAPFILE = $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous
+  UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200.anonymous
+else ifneq ($(wildcard $(UNPACK_MAPFILE_PLATFORM_FILE)), )
+  UNPACK_MAPFILE := $(UNPACK_MAPFILE_PLATFORM_FILE)
 else
-  UNPACK_MAPFILE = $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers-unpack200
+  UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200
 endif
 
 $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
--- old/jdk/make/mapfiles/launchers/mapfile-x86_64	2015-04-13 15:23:11.548323276 +0200
+++ new/jdk/make/mapfiles/launchers/mapfile-x86_64	2015-04-13 15:23:11.304313017 +0200
@@ -34,6 +34,14 @@
 		_environ;
 		__environ_lock;
 
+		# These are needed by the c runtime in SS12u4
+		___Argv;
+		__xargv;
+		__xargc;
+		_start;
+		__longdouble_used;
+		_lib_version;
+
 	local:
 		*;
 };
--- /dev/null	2015-03-13 16:30:25.487094356 +0100
+++ new/jdk/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc	2015-04-13 15:23:11.912338581 +0200
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2011, 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 library interface.
+
+SUNWprivate_1.1 {
+	global:
+		# These are needed by the c runtime in SS12u4
+		_environ;
+		__environ_lock;
+		___Argv;
+		__xargv;
+		__xargc;
+		_start;
+		_lib_version;
+
+	local:
+	    *;
+};
--- /dev/null	2015-03-13 16:30:25.487094356 +0100
+++ new/jdk/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86	2015-04-13 15:23:12.460361623 +0200
@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2011, 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 library interface.
+
+SUNWprivate_1.1 {
+	global:
+		# These are needed by the c runtime in SS12u4
+		_environ;
+		__environ_lock;
+		___Argv;
+		__xargv;
+		__xargc;
+		_start;
+		__longdouble_used;
+		_lib_version;
+
+	local:
+	    *;
+};