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

3 files changed, 74 insertions, 84 deletions

diff --git a/usr/src/lib/libelfsign/Makefile.com b/usr/src/lib/libelfsign/Makefile.com
index b1490ce92a..37a3a076ad 100644
--- a/usr/src/lib/libelfsign/Makefile.com
+++ b/usr/src/lib/libelfsign/Makefile.com
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY = libelfsign.a
@@ -39,9 +38,6 @@ $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 LDLIBS +=	-lmd -lelf -lkmf -lcryptoutil -lc
 
-MAPFILE =	mapfile
-MAPFILES =	$(MAPFILE)
-
 CFLAGS +=	$(CCMT) $(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 
@@ -51,10 +47,4 @@ all:		$(LIBS)
 
 lint:		lintcheck
 
-$(MAPFILE):	$(SRCDIR)/$(MAPFILE).map
-		$(RM) $@
-		$(CPP) $(SRCDIR)/$(MAPFILE).map > $@
-
-CLEANFILES +=	$(MAPFILE)
-
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/libelfsign/common/mapfile-vers b/usr/src/lib/libelfsign/common/mapfile-vers
new file mode 100644
index 0000000000..7583d6fe28
--- /dev/null
+++ b/usr/src/lib/libelfsign/common/mapfile-vers
@@ -0,0 +1,73 @@
+#
+# 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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# 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
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+	elfsign_begin;
+	elfsign_buffer_len;
+	elfsign_end;
+	elfsign_extract_sig;
+	elfsign_hash;
+	elfsign_hash_mem_resident;
+	elfsign_insert_dso;
+	elfsign_setcallbackctx;
+	elfsign_setsigvercallback;
+	elfsign_setcertpath;
+	elfsign_sig_info;
+	elfsign_sig_info_free;
+	elfsign_signatures;
+	elfsign_strerror;
+	elfsign_verify_signature;
+	elfcertlib_getcert;
+	elfcertlib_getdn;
+	elfcertlib_getissuer;
+	elfcertlib_init;
+	elfcertlib_loadprivatekey;
+	elfcertlib_loadtokenkey;
+	elfcertlib_releasecert;
+	elfcertlib_setcertCAcallback;
+	elfcertlib_setcertvercallback;
+	elfcertlib_settoken;
+	elfcertlib_sign;
+	elfcertlib_verifycert;
+	elfcertlib_verifysig;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libelfsign/common/mapfile.map b/usr/src/lib/libelfsign/common/mapfile.map
deleted file mode 100644
index a500384e1c..0000000000
--- a/usr/src/lib/libelfsign/common/mapfile.map
+++ /dev/null
@@ -1,73 +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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
- */
-
-
-/*
- * 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_1.1 {
-    global:
-	elfsign_begin;
-	elfsign_buffer_len;
-	elfsign_end;
-	elfsign_extract_sig;
-	elfsign_hash;
-	elfsign_hash_mem_resident;
-	elfsign_insert_dso;
-	elfsign_setcallbackctx;
-	elfsign_setsigvercallback;
-	elfsign_setcertpath;
-	elfsign_sig_info;
-	elfsign_sig_info_free;
-	elfsign_signatures;
-	elfsign_strerror;
-	elfsign_verify_signature;
-	elfcertlib_getcert;
-	elfcertlib_getdn;
-	elfcertlib_getissuer;
-	elfcertlib_init;
-	elfcertlib_loadprivatekey;
-	elfcertlib_loadtokenkey;
-	elfcertlib_releasecert;
-	elfcertlib_setcertCAcallback;
-	elfcertlib_setcertvercallback;
-	elfcertlib_settoken;
-	elfcertlib_sign;
-	elfcertlib_verifycert;
-	elfcertlib_verifysig;
-    local:
-	*;
-};