1 files changed, 85 insertions, 30 deletions
diff --git a/usr/src/cmd/sgs/libdl/common/mapfile-vers b/usr/src/cmd/sgs/libdl/common/mapfile-vers
index 6dfa35cbc0..9251d2ab0b 100644
--- a/usr/src/cmd/sgs/libdl/common/mapfile-vers
+++ b/usr/src/cmd/sgs/libdl/common/mapfile-vers
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,40 +37,96 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.4 {
-    global:
-	dladdr1 = FUNCTION;
-    local:
-	*;
+$mapfile_version 2
+
+$if _x86 && _ELF64
+$add amd64
+$endif
+
+# Starting with SUNW_1.5 and dlamd64getunwind(), the amd64
+# platform is one version ahead of the other platforms.
+$if amd64
+SYMBOL_VERSION SUNW_1.6 {
+$else
+SYMBOL_VERSION SUNW_1.5 {
+$endif
+	global:
+		dl_iterate_phdr		{ TYPE = FUNCTION };
+$if amd64
+} SUNW_1.5;
+
+SYMBOL_VERSION SUNW_1.5 {
+	global:
+		dlamd64getunwind	{ TYPE = FUNCTION };
+$endif
+} SUNW_1.4;
+
+SYMBOL_VERSION SUNW_1.4 {
+	global:
+		dladdr1			{ TYPE = FUNCTION };
 } SUNW_1.3;
 
-SUNW_1.3 {
-    global:
-	SUNW_1.3;
+SYMBOL_VERSION SUNW_1.3 {
+	global:
+		SUNW_1.3;
 } SUNW_1.2;
 
-SUNW_1.2 {
-    global:
-	SUNW_1.2;
+SYMBOL_VERSION SUNW_1.2 {
+	global:
+		SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
-    global:
-	dldump = FUNCTION;
-	dlinfo = FUNCTION;
-	dlmopen = FUNCTION;
+SYMBOL_VERSION SUNW_1.1 {
+	global:
+		dldump			{ TYPE = FUNCTION };
+		dlinfo			{ TYPE = FUNCTION };
+		dlmopen			{ TYPE = FUNCTION };
 } SUNW_0.8;
 
-SUNWprivate_1.1 {
-    global:
-	_ld_libc = FUNCTION;
-	_dlinfo = FUNCTION;
-	_dldump = FUNCTION;
-	_dlmopen = FUNCTION;
-	_dlopen = FUNCTION;
-	_dlerror = FUNCTION;
-	_dlsym = FUNCTION;
-	_dlclose = FUNCTION;
-	_dladdr = FUNCTION;
-	_dladdr1 = FUNCTION;
+SYMBOL_VERSION SUNW_0.8 {
+	global:
+		dladdr			{ TYPE = FUNCTION };
+} SUNW_0.7;
+
+
+#
+# For most platforms, SUNW_0.7 contains dlclose, dlerror, dlopen, and dlsym.
+# For ABI reasons, 32-bit sparc puts them in SISCD_2.3 instead, and SUNW_0.7
+# exists solely so that SUNW_0.8 can inherit from it on all platforms.
+#
+SYMBOL_VERSION SUNW_0.7 {
+	global:
+$if _sparc && _ELF32
+		SUNW_0.7;
+} SISCD_2.3;
+
+SYMBOL_VERSION SISCD_2.3 {
+	global:
+$endif
+		dlclose			{ TYPE = FUNCTION };
+		dlerror			{ TYPE = FUNCTION };
+		dlopen			{ TYPE = FUNCTION };
+		dlsym			{ TYPE = FUNCTION };
+};
+
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+	global:
+		_ld_libc		{ TYPE = FUNCTION };
+		_dlinfo			{ TYPE = FUNCTION };
+		_dldump			{ TYPE = FUNCTION };
+		_dlmopen		{ TYPE = FUNCTION };
+		_dlopen			{ TYPE = FUNCTION };
+		_dlerror		{ TYPE = FUNCTION };
+		_dlsym			{ TYPE = FUNCTION };
+		_dlclose		{ TYPE = FUNCTION };
+		_dladdr			{ TYPE = FUNCTION };
+		_dladdr1		{ TYPE = FUNCTION };
+
+$if amd64
+		_dlamd64getunwind	{ TYPE = FUNCTION };
+$endif
+
+	local:
+		*;
 };