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

7 files changed, 30 insertions, 122 deletions

diff --git a/usr/src/cmd/sgs/librtld/amd64/Makefile b/usr/src/cmd/sgs/librtld/amd64/Makefile
index e0645150c2..b642bc3270 100644
--- a/usr/src/cmd/sgs/librtld/amd64/Makefile
+++ b/usr/src/cmd/sgs/librtld/amd64/Makefile
@@ -20,16 +20,12 @@
 #
 
 #
-# 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.
 #
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.com
 
 CPPFLAGS +=	-I../../../../uts/intel/amd64/krtld
-MAPFILES +=	../common/mapfile-64-vers
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/sgs/librtld/common/mapfile-32-vers b/usr/src/cmd/sgs/librtld/common/mapfile-32-vers
deleted file mode 100644
index b15133bf3f..0000000000
--- a/usr/src/cmd/sgs/librtld/common/mapfile-32-vers
+++ /dev/null
@@ -1,45 +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
-#
-
-{
-	global:
-		do32_reloc_rtld =	FUNCTION parent;
-		reloc32_table =		DATA parent;
-};
diff --git a/usr/src/cmd/sgs/librtld/common/mapfile-64-vers b/usr/src/cmd/sgs/librtld/common/mapfile-64-vers
deleted file mode 100644
index d8fcf65118..0000000000
--- a/usr/src/cmd/sgs/librtld/common/mapfile-64-vers
+++ /dev/null
@@ -1,45 +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
-#
-
-{
-	global:
-		do64_reloc_rtld =	FUNCTION parent;
-		reloc64_table =		DATA parent;
-};
diff --git a/usr/src/cmd/sgs/librtld/common/mapfile-vers b/usr/src/cmd/sgs/librtld/common/mapfile-vers
index c8e8189a09..4c6768d3ac 100644
--- a/usr/src/cmd/sgs/librtld/common/mapfile-vers
+++ b/usr/src/cmd/sgs/librtld/common/mapfile-vers
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,21 +37,36 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.3 {
 	global:
 		rt_dldump;
 };
 
-{
+SYMBOL_SCOPE {
 	global:
-		alist_append =	FUNCTION parent;
-		elf_plt_write =	FUNCTION parent;
-		eprintf =	FUNCTION parent;
-		is_so_loaded =	FUNCTION parent;
-		lookup_sym =	FUNCTION parent;
-
-		ld_entry_cnt =	DATA parent;
-		lml_main =	DATA parent;
+		alist_append	{ TYPE = FUNCTION; FLAGS = PARENT };
+		elf_plt_write	{ TYPE = FUNCTION; FLAGS = PARENT };
+		eprintf		{ TYPE = FUNCTION; FLAGS = PARENT };
+		is_so_loaded	{ TYPE = FUNCTION; FLAGS = PARENT };
+		lookup_sym	{ TYPE = FUNCTION; FLAGS = PARENT };
+
+		ld_entry_cnt	{ TYPE = DATA; FLAGS = PARENT };
+		lml_main	{ TYPE = DATA; FLAGS = PARENT };
+
+
+$if _ELF32
+		do32_reloc_rtld	{ TYPE = FUNCTION; FLAGS = PARENT };
+		reloc32_table	{ TYPE = DATA; FLAGS = PARENT };
+$elif _ELF64
+		do64_reloc_rtld	{ TYPE = FUNCTION; FLAGS = PARENT };
+		reloc64_table	{ TYPE = DATA; FLAGS = PARENT };
+$else
+$error unknown ELFCLASS
+$endif
+
+
 	local:
 		*;
 };
diff --git a/usr/src/cmd/sgs/librtld/i386/Makefile b/usr/src/cmd/sgs/librtld/i386/Makefile
index d0972f0319..546a8504fe 100644
--- a/usr/src/cmd/sgs/librtld/i386/Makefile
+++ b/usr/src/cmd/sgs/librtld/i386/Makefile
@@ -20,16 +20,12 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.com
 
 CPPFLAGS +=	-I../../../../uts/intel/ia32/krtld
-MAPFILES +=	../common/mapfile-32-vers
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/sgs/librtld/sparc/Makefile b/usr/src/cmd/sgs/librtld/sparc/Makefile
index 5d07608807..33efa5334e 100644
--- a/usr/src/cmd/sgs/librtld/sparc/Makefile
+++ b/usr/src/cmd/sgs/librtld/sparc/Makefile
@@ -20,16 +20,12 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.com
 
 CPPFLAGS +=	-I../../../../uts/sparc/krtld
-MAPFILES +=	../common/mapfile-32-vers
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/sgs/librtld/sparcv9/Makefile b/usr/src/cmd/sgs/librtld/sparcv9/Makefile
index eba63918c2..0fdca1ad1f 100644
--- a/usr/src/cmd/sgs/librtld/sparcv9/Makefile
+++ b/usr/src/cmd/sgs/librtld/sparcv9/Makefile
@@ -20,16 +20,12 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.com
 
 CPPFLAGS +=	-I../../../../uts/sparc/krtld
-MAPFILES +=	../common/mapfile-64-vers
 
 .KEEP_STATE: