6916796 OSnet mapfiles should use version 2 link-editor syntax

--HG--
rename : usr/src/cmd/sgs/libelf/common/mapfile-common => usr/src/cmd/sgs/libelf/common/mapfile-vers
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings => usr/src/cmd/sgs/link_audit/common/mapfile-vers-bindings
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt => usr/src/cmd/sgs/link_audit/common/mapfile-vers-perfcnt
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep => usr/src/cmd/sgs/link_audit/common/mapfile-vers-symbindrep
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss => usr/src/cmd/sgs/link_audit/common/mapfile-vers-truss
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who => usr/src/cmd/sgs/link_audit/common/mapfile-vers-who
rename : usr/src/common/mapfiles/i386/map.noexdata => usr/src/common/mapfiles/common/map.noexdata
rename : usr/src/lib/libaio/sparc/mapfile-vers => usr/src/lib/libaio/common/mapfile-vers
rename : usr/src/lib/libelfsign/common/mapfile.map => usr/src/lib/libelfsign/common/mapfile-vers
rename : usr/src/lib/libpthread/sparc/mapfile-vers => usr/src/lib/libpthread/common/mapfile-vers
rename : usr/src/lib/librt/amd64/mapfile-vers => usr/src/lib/librt/common/mapfile-vers
rename : usr/src/lib/libsys/sparc/mapfile-vers => usr/src/lib/libsys/common/mapfile-vers
rename : usr/src/lib/libthread/sparc/mapfile-vers => usr/src/lib/libthread/common/mapfile-vers

6 files changed, 31 insertions, 204 deletions

diff --git a/usr/src/lib/ncad_addr/Makefile.com b/usr/src/lib/ncad_addr/Makefile.com
index aaf827792a..f7c5994bba 100644
--- a/usr/src/lib/ncad_addr/Makefile.com
+++ b/usr/src/lib/ncad_addr/Makefile.com
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	ncad_addr.a
@@ -33,8 +30,6 @@ include ../../Makefile.lib
 
 SRCDIR =	../common
 
-MAPFILES +=	mapfile-vers
-
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lnsl
 CFLAGS +=	$(CCVERBOSE)
diff --git a/usr/src/lib/ncad_addr/amd64/mapfile-vers b/usr/src/lib/ncad_addr/amd64/mapfile-vers
deleted file mode 100644
index bca03ea513..0000000000
--- a/usr/src/lib/ncad_addr/amd64/mapfile-vers
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	# Bind is intended to interpose on the real system call. However,
-	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
-	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
-	bind = NODYNSORT;
-};
diff --git a/usr/src/lib/ncad_addr/common/mapfile-vers b/usr/src/lib/ncad_addr/common/mapfile-vers
index 98c87b3a33..66479635e0 100644
--- a/usr/src/lib/ncad_addr/common/mapfile-vers
+++ b/usr/src/lib/ncad_addr/common/mapfile-vers
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,44 +36,66 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # The following version madness was mistakenly inherited from
 # libsocket in Solaris 9, when this library was created.
 # See the isa-specific mapfiles for the contents of SUNW_0.7
 
-SUNW_1.4 {		# SunOS 5.9 (Solaris 9)
+SYMBOL_VERSION SUNW_1.4 {		# SunOS 5.9 (Solaris 9)
     global:
 	SUNW_1.4;
 } SUNW_1.3;
 
-SUNW_1.3 {
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	SUNW_1.3;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.7;
 
+#
+# For most platforms, SUNW_0.7 contains bind. For ABI reasons, 32-bit sparc
+# puts it in SISCD_2.3 instead, and SUNW_0.7 exists solely so that 1.1 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
+	# Bind is intended to interpose on the real system call. However,
+	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
+	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
+	bind			{ FLAGS = NODYNSORT };
+};
+
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.3
 
-SUNWprivate_1.3 {
+SYMBOL_VERSION SUNWprivate_1.3 {
     global:
 	SUNWprivate_1.3;
 } SUNWprivate_1.2;
 
-SUNWprivate_1.2 {
+SYMBOL_VERSION SUNWprivate_1.2 {
     global:
 	SUNWprivate_1.2;
 } SUNWprivate_1.1;
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
diff --git a/usr/src/lib/ncad_addr/i386/mapfile-vers b/usr/src/lib/ncad_addr/i386/mapfile-vers
deleted file mode 100644
index bca03ea513..0000000000
--- a/usr/src/lib/ncad_addr/i386/mapfile-vers
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	# Bind is intended to interpose on the real system call. However,
-	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
-	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
-	bind = NODYNSORT;
-};
diff --git a/usr/src/lib/ncad_addr/sparc/mapfile-vers b/usr/src/lib/ncad_addr/sparc/mapfile-vers
deleted file mode 100644
index 59e88c8e43..0000000000
--- a/usr/src/lib/ncad_addr/sparc/mapfile-vers
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	SUNW_0.7;
-} SISCD_2.3;
-
-SISCD_2.3 {
-    global:
-	# Bind is intended to interpose on the real system call. However,
-	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
-	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
-	bind = NODYNSORT;
-};
diff --git a/usr/src/lib/ncad_addr/sparcv9/mapfile-vers b/usr/src/lib/ncad_addr/sparcv9/mapfile-vers
deleted file mode 100644
index bca03ea513..0000000000
--- a/usr/src/lib/ncad_addr/sparcv9/mapfile-vers
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	# Bind is intended to interpose on the real system call. However,
-	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
-	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
-	bind = NODYNSORT;
-};