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, 43 insertions, 272 deletions

diff --git a/usr/src/lib/libcpc/Makefile.com b/usr/src/lib/libcpc/Makefile.com
index d3c143c38f..b18942e533 100644
--- a/usr/src/lib/libcpc/Makefile.com
+++ b/usr/src/lib/libcpc/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 = libcpc.a
@@ -44,8 +41,6 @@ LDLIBS +=	-lpctx -lnvpair -lc
 
 SRCDIR =	../common
 
-MAPFILES +=	mapfile-vers
-
 ASFLAGS +=	-P -D_ASM -I../common
 CPPFLAGS +=	-D_REENTRANT -I../common
 CFLAGS +=	$(CCVERBOSE)
diff --git a/usr/src/lib/libcpc/amd64/mapfile-vers b/usr/src/lib/libcpc/amd64/mapfile-vers
deleted file mode 100644
index 136fdbae9a..0000000000
--- a/usr/src/lib/libcpc/amd64/mapfile-vers
+++ /dev/null
@@ -1,42 +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_1.2 {
-    global:
-};
diff --git a/usr/src/lib/libcpc/common/mapfile-vers b/usr/src/lib/libcpc/common/mapfile-vers
index e577fc7c5e..330ed4b118 100644
--- a/usr/src/lib/libcpc/common/mapfile-vers
+++ b/usr/src/lib/libcpc/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,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	cpc_walk_generic_events_pic;
 	cpc_walk_generic_events_all;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	cpc_bind_cpu;
 	cpc_bind_curlwp;
@@ -78,9 +79,45 @@ SUNW_1.2 {
 	cpc_walk_events_all;
 	cpc_walk_events_pic;
 	cpc_walk_requests;
+
+	# On all platforms other than amd64, SUNW_1.2 inherts SUNW_1.1,
+	# which supplies additional functions. On amd64, there is no SUNW_1.1.
+$if !(_x86 && _ELF64)
+} SUNW_1.1 ;
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+	cpc_access;
+	cpc_bind_event;
+	cpc_count_sys_events;
+	cpc_count_usr_events;
+	cpc_event_accum;
+	cpc_event_diff;
+	cpc_eventtostr;
+	cpc_getcciname;
+	cpc_getcpuref;
+	cpc_getcpuver;
+	cpc_getnpic;
+	cpc_getusage;
+	cpc_pctx_bind_event;
+	cpc_pctx_invalidate;
+	cpc_pctx_rele;
+	cpc_pctx_take_sample;
+	cpc_rele;
+	cpc_seterrfn;
+	cpc_shared_bind_event;
+	cpc_shared_close;
+	cpc_shared_open;
+	cpc_shared_rele;
+	cpc_shared_take_sample;
+	cpc_strtoevent;
+	cpc_take_sample;
+	cpc_version;
+	cpc_walk_names;
+$endif
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
 	cpc_terminate;
diff --git a/usr/src/lib/libcpc/i386/mapfile-vers b/usr/src/lib/libcpc/i386/mapfile-vers
deleted file mode 100644
index 1a7fb44d78..0000000000
--- a/usr/src/lib/libcpc/i386/mapfile-vers
+++ /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 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_1.2 {
-    global:
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	cpc_access;
-	cpc_bind_event;
-	cpc_count_sys_events;
-	cpc_count_usr_events;
-	cpc_event_accum;
-	cpc_event_diff;
-	cpc_eventtostr;
-	cpc_getcciname;
-	cpc_getcpuref;
-	cpc_getcpuver;
-	cpc_getnpic;
-	cpc_getusage;
-	cpc_pctx_bind_event;
-	cpc_pctx_invalidate;
-	cpc_pctx_rele;
-	cpc_pctx_take_sample;
-	cpc_rele;
-	cpc_seterrfn;
-	cpc_shared_bind_event;
-	cpc_shared_close;
-	cpc_shared_open;
-	cpc_shared_rele;
-	cpc_shared_take_sample;
-	cpc_strtoevent;
-	cpc_take_sample;
-	cpc_version;
-	cpc_walk_names;
-};
diff --git a/usr/src/lib/libcpc/sparc/mapfile-vers b/usr/src/lib/libcpc/sparc/mapfile-vers
deleted file mode 100644
index 1a7fb44d78..0000000000
--- a/usr/src/lib/libcpc/sparc/mapfile-vers
+++ /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 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_1.2 {
-    global:
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	cpc_access;
-	cpc_bind_event;
-	cpc_count_sys_events;
-	cpc_count_usr_events;
-	cpc_event_accum;
-	cpc_event_diff;
-	cpc_eventtostr;
-	cpc_getcciname;
-	cpc_getcpuref;
-	cpc_getcpuver;
-	cpc_getnpic;
-	cpc_getusage;
-	cpc_pctx_bind_event;
-	cpc_pctx_invalidate;
-	cpc_pctx_rele;
-	cpc_pctx_take_sample;
-	cpc_rele;
-	cpc_seterrfn;
-	cpc_shared_bind_event;
-	cpc_shared_close;
-	cpc_shared_open;
-	cpc_shared_rele;
-	cpc_shared_take_sample;
-	cpc_strtoevent;
-	cpc_take_sample;
-	cpc_version;
-	cpc_walk_names;
-};
diff --git a/usr/src/lib/libcpc/sparcv9/mapfile-vers b/usr/src/lib/libcpc/sparcv9/mapfile-vers
deleted file mode 100644
index 1a7fb44d78..0000000000
--- a/usr/src/lib/libcpc/sparcv9/mapfile-vers
+++ /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 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_1.2 {
-    global:
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	cpc_access;
-	cpc_bind_event;
-	cpc_count_sys_events;
-	cpc_count_usr_events;
-	cpc_event_accum;
-	cpc_event_diff;
-	cpc_eventtostr;
-	cpc_getcciname;
-	cpc_getcpuref;
-	cpc_getcpuver;
-	cpc_getnpic;
-	cpc_getusage;
-	cpc_pctx_bind_event;
-	cpc_pctx_invalidate;
-	cpc_pctx_rele;
-	cpc_pctx_take_sample;
-	cpc_rele;
-	cpc_seterrfn;
-	cpc_shared_bind_event;
-	cpc_shared_close;
-	cpc_shared_open;
-	cpc_shared_rele;
-	cpc_shared_take_sample;
-	cpc_strtoevent;
-	cpc_take_sample;
-	cpc_version;
-	cpc_walk_names;
-};