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, 278 insertions, 1071 deletions

diff --git a/usr/src/lib/libpthread/Makefile.com b/usr/src/lib/libpthread/Makefile.com
index 74cc5833ad..cd435324e8 100644
--- a/usr/src/lib/libpthread/Makefile.com
+++ b/usr/src/lib/libpthread/Makefile.com
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	libpthread.a
@@ -30,4 +29,3 @@ include		$(SRC)/lib/Makefile.rootfs
 
 LIBS +=		$(LINTLIB)
 DYNFLAGS +=	-F libc.so.1
-MAPFILEDIR =	.				# redirect mapfile-vers
diff --git a/usr/src/lib/libpthread/amd64/mapfile-vers b/usr/src/lib/libpthread/amd64/mapfile-vers
deleted file mode 100644
index fdaf4c0bfd..0000000000
--- a/usr/src/lib/libpthread/amd64/mapfile-vers
+++ /dev/null
@@ -1,265 +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
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	getmsg = FUNCTION;
-	getpmsg = FUNCTION;
-	lockf = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	poll = FUNCTION;
-	putmsg = FUNCTION;
-	putpmsg = FUNCTION;
-	select = FUNCTION;
-	sigpause = FUNCTION;
-	usleep = FUNCTION;
-	wait3 = FUNCTION;
-	waitid = FUNCTION;
-	pread = FUNCTION;
-	pwrite = FUNCTION;
-	readv = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	SUNW_1.1;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_destroy = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	pthread_cancel = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_create = FUNCTION;
-	pthread_detach = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_join = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_kill = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	alarm = FUNCTION;
-	close = FUNCTION;
-	cond_broadcast = FUNCTION;
-	cond_destroy = FUNCTION;
-	cond_init = FUNCTION;
-	cond_signal = FUNCTION;
-	cond_timedwait = FUNCTION;
-	cond_wait = FUNCTION;
-	creat = FUNCTION;
-	fcntl = FUNCTION;
-	fork = FUNCTION;
-	fork1 = FUNCTION;
-	fsync = FUNCTION;
-	msync = FUNCTION;
-	mutex_destroy = FUNCTION;
-	mutex_init = FUNCTION;
-	mutex_lock = FUNCTION;
-	mutex_trylock = FUNCTION;
-	mutex_unlock = FUNCTION;
-	open = FUNCTION;
-	pause = FUNCTION;
-	read = FUNCTION;
-	rw_rdlock = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	rw_unlock = FUNCTION;
-	rw_wrlock = FUNCTION;
-	rwlock_init = FUNCTION;
-	sema_destroy = FUNCTION;
-	sema_init = FUNCTION;
-	sema_post = FUNCTION;
-	sema_trywait = FUNCTION;
-	sema_wait = FUNCTION;
-	_getfp = FUNCTION;
-	setitimer = FUNCTION;
-	siglongjmp = FUNCTION;
-	sigsetjmp = FUNCTION;
-	sigaction = FUNCTION;
-	sigprocmask = FUNCTION;
-	sigsuspend = FUNCTION;
-	sigwait = FUNCTION;
-	sleep = FUNCTION;
-	tcdrain = FUNCTION;
-	thr_continue = FUNCTION;
-	thr_create = FUNCTION;
-	thr_exit = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_getprio = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_join = FUNCTION;
-	thr_keycreate = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_main = FUNCTION;
-	thr_min_stack = FUNCTION;
-	thr_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_setprio = FUNCTION;
-	thr_setspecific = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	thr_stksegment = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_yield = FUNCTION;
-	wait = FUNCTION;
-	waitpid = FUNCTION;
-	write = FUNCTION;
-	_mutex_lock = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_pthread_setcleanupinit = FUNCTION;
-	_resume = FUNCTION;
-	_resume_ret = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_fork = FUNCTION;
-	_sigaction = FUNCTION;
-	_sigprocmask = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	_siglongjmp = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_setitimer = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_mutex_init = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_thr_create = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_thr_join = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_self = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_thr_main = FUNCTION;
-};
-
diff --git a/usr/src/lib/libpthread/common/mapfile-vers b/usr/src/lib/libpthread/common/mapfile-vers
new file mode 100644
index 0000000000..11c260863c
--- /dev/null
+++ b/usr/src/lib/libpthread/common/mapfile-vers
@@ -0,0 +1,277 @@
+#
+# 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) 2003, 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
+
+#
+# DO NOT TOUCH THIS FILE.
+# This file declares interfaces that are cast in stone.
+# They offer interfaces that will never change.
+# DO NOT TOUCH THIS FILE.
+#
+
+SYMBOL_VERSION SUNW_1.4 {
+    global:
+	cond_reltimedwait			{ TYPE = FUNCTION };
+	pthread_cond_reltimedwait_np		{ TYPE = FUNCTION };
+    local:
+	*;
+} SUNW_1.3;
+
+SYMBOL_VERSION SUNW_1.3 {
+    global:
+	pthread_mutexattr_getrobust_np		{ TYPE = FUNCTION };
+	pthread_mutexattr_setrobust_np		{ TYPE = FUNCTION };
+	pthread_mutex_consistent_np		{ TYPE = FUNCTION };
+} SUNW_1.2;
+
+SYMBOL_VERSION SUNW_1.2 {
+    global:
+	getmsg					{ TYPE = FUNCTION };
+	getpmsg					{ TYPE = FUNCTION };
+	lockf					{ TYPE = FUNCTION };
+	msgrcv					{ TYPE = FUNCTION };
+	msgsnd					{ TYPE = FUNCTION };
+	poll					{ TYPE = FUNCTION };
+	pread					{ TYPE = FUNCTION };
+	pthread_attr_getguardsize		{ TYPE = FUNCTION };
+	pthread_attr_setguardsize		{ TYPE = FUNCTION };
+	pthread_getconcurrency			{ TYPE = FUNCTION };
+	pthread_mutexattr_gettype		{ TYPE = FUNCTION };
+	pthread_mutexattr_settype		{ TYPE = FUNCTION };
+	pthread_rwlockattr_destroy		{ TYPE = FUNCTION };
+	pthread_rwlockattr_getpshared		{ TYPE = FUNCTION };
+	pthread_rwlockattr_init			{ TYPE = FUNCTION };
+	pthread_rwlockattr_setpshared		{ TYPE = FUNCTION };
+	pthread_rwlock_destroy			{ TYPE = FUNCTION };
+	pthread_rwlock_init			{ TYPE = FUNCTION };
+	pthread_rwlock_rdlock			{ TYPE = FUNCTION };
+	pthread_rwlock_tryrdlock		{ TYPE = FUNCTION };
+	pthread_rwlock_trywrlock		{ TYPE = FUNCTION };
+	pthread_rwlock_unlock			{ TYPE = FUNCTION };
+	pthread_rwlock_wrlock			{ TYPE = FUNCTION };
+	pthread_setconcurrency			{ TYPE = FUNCTION };
+	putmsg					{ TYPE = FUNCTION };
+	putpmsg					{ TYPE = FUNCTION };
+	pwrite					{ TYPE = FUNCTION };
+	readv					{ TYPE = FUNCTION };
+	select					{ TYPE = FUNCTION };
+	sigpause				{ TYPE = FUNCTION };
+	usleep					{ TYPE = FUNCTION };
+	wait3					{ TYPE = FUNCTION };
+	waitid					{ TYPE = FUNCTION };
+	writev					{ TYPE = FUNCTION };
+	__xpg4_putmsg				{ TYPE = FUNCTION };
+	__xpg4_putpmsg				{ TYPE = FUNCTION };
+
+$if _ELF32		# largefile APIs
+	lockf64					{ TYPE = FUNCTION };
+	pread64					{ TYPE = FUNCTION };
+	pwrite64				{ TYPE = FUNCTION };
+$endif
+} SUNW_1.1;
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+$if _ELF32		# largefile APIs
+	creat64					{ TYPE = FUNCTION };
+	open64					{ TYPE = FUNCTION };
+$else
+	SUNW_1.1;
+$endif
+} SUNW_0.9;
+
+SYMBOL_VERSION SUNW_0.9 {
+    global:
+	alarm					{ TYPE = FUNCTION };
+	close					{ TYPE = FUNCTION };
+	cond_broadcast				{ TYPE = FUNCTION };
+	cond_destroy				{ TYPE = FUNCTION };
+	cond_init				{ TYPE = FUNCTION };
+	cond_signal				{ TYPE = FUNCTION };
+	cond_timedwait				{ TYPE = FUNCTION };
+	cond_wait				{ TYPE = FUNCTION };
+	creat					{ TYPE = FUNCTION };
+	fcntl					{ TYPE = FUNCTION };
+	fork					{ TYPE = FUNCTION };
+	fork1					{ TYPE = FUNCTION };
+	fsync					{ TYPE = FUNCTION };
+	_getfp					{ TYPE = FUNCTION };
+	msync					{ TYPE = FUNCTION };
+	mutex_destroy				{ TYPE = FUNCTION };
+	mutex_init				{ TYPE = FUNCTION };
+	_mutex_lock				{ TYPE = FUNCTION };
+	mutex_lock				{ TYPE = FUNCTION };
+	mutex_trylock				{ TYPE = FUNCTION };
+	mutex_unlock				{ TYPE = FUNCTION };
+	open					{ TYPE = FUNCTION };
+	pause					{ TYPE = FUNCTION };
+	pthread_attr_destroy			{ TYPE = FUNCTION };
+	pthread_attr_getdetachstate		{ TYPE = FUNCTION };
+	pthread_attr_getinheritsched		{ TYPE = FUNCTION };
+	pthread_attr_getschedparam		{ TYPE = FUNCTION };
+	pthread_attr_getschedpolicy		{ TYPE = FUNCTION };
+	pthread_attr_getscope			{ TYPE = FUNCTION };
+	pthread_attr_getstackaddr		{ TYPE = FUNCTION };
+	pthread_attr_getstacksize		{ TYPE = FUNCTION };
+	pthread_attr_init			{ TYPE = FUNCTION };
+	pthread_attr_setdetachstate		{ TYPE = FUNCTION };
+	pthread_attr_setinheritsched		{ TYPE = FUNCTION };
+	pthread_attr_setschedparam		{ TYPE = FUNCTION };
+	pthread_attr_setschedpolicy		{ TYPE = FUNCTION };
+	pthread_attr_setscope			{ TYPE = FUNCTION };
+	pthread_attr_setstackaddr		{ TYPE = FUNCTION };
+	pthread_attr_setstacksize		{ TYPE = FUNCTION };
+	pthread_cancel				{ TYPE = FUNCTION };
+	__pthread_cleanup_pop			{ TYPE = FUNCTION };
+	__pthread_cleanup_push			{ TYPE = FUNCTION };
+	pthread_condattr_destroy		{ TYPE = FUNCTION };
+	pthread_condattr_getpshared		{ TYPE = FUNCTION };
+	pthread_condattr_init			{ TYPE = FUNCTION };
+	pthread_condattr_setpshared		{ TYPE = FUNCTION };
+	pthread_cond_broadcast			{ TYPE = FUNCTION };
+	pthread_cond_destroy			{ TYPE = FUNCTION };
+	pthread_cond_init			{ TYPE = FUNCTION };
+	pthread_cond_signal			{ TYPE = FUNCTION };
+	pthread_cond_timedwait			{ TYPE = FUNCTION };
+	pthread_cond_wait			{ TYPE = FUNCTION };
+	pthread_create				{ TYPE = FUNCTION };
+	pthread_detach				{ TYPE = FUNCTION };
+	pthread_equal				{ TYPE = FUNCTION };
+	pthread_exit				{ TYPE = FUNCTION };
+	pthread_getschedparam			{ TYPE = FUNCTION };
+	pthread_getspecific			{ TYPE = FUNCTION };
+	pthread_join				{ TYPE = FUNCTION };
+	pthread_key_create			{ TYPE = FUNCTION };
+	pthread_key_delete			{ TYPE = FUNCTION };
+	pthread_kill				{ TYPE = FUNCTION };
+	pthread_mutexattr_destroy		{ TYPE = FUNCTION };
+	pthread_mutexattr_getprioceiling	{ TYPE = FUNCTION };
+	pthread_mutexattr_getprotocol		{ TYPE = FUNCTION };
+	pthread_mutexattr_getpshared		{ TYPE = FUNCTION };
+	pthread_mutexattr_init			{ TYPE = FUNCTION };
+	pthread_mutexattr_setprioceiling	{ TYPE = FUNCTION };
+	pthread_mutexattr_setprotocol		{ TYPE = FUNCTION };
+	pthread_mutexattr_setpshared		{ TYPE = FUNCTION };
+	pthread_mutex_destroy			{ TYPE = FUNCTION };
+	pthread_mutex_getprioceiling		{ TYPE = FUNCTION };
+	pthread_mutex_init			{ TYPE = FUNCTION };
+	pthread_mutex_lock			{ TYPE = FUNCTION };
+	pthread_mutex_setprioceiling		{ TYPE = FUNCTION };
+	pthread_mutex_trylock			{ TYPE = FUNCTION };
+	pthread_mutex_unlock			{ TYPE = FUNCTION };
+	pthread_once				{ TYPE = FUNCTION };
+	pthread_self				{ TYPE = FUNCTION };
+	pthread_setcancelstate			{ TYPE = FUNCTION };
+	pthread_setcanceltype			{ TYPE = FUNCTION };
+	pthread_setschedparam			{ TYPE = FUNCTION };
+	pthread_setspecific			{ TYPE = FUNCTION };
+	pthread_sigmask				{ TYPE = FUNCTION };
+	pthread_testcancel			{ TYPE = FUNCTION };
+	read					{ TYPE = FUNCTION };
+	rwlock_init				{ TYPE = FUNCTION };
+	rw_rdlock				{ TYPE = FUNCTION };
+	rw_tryrdlock				{ TYPE = FUNCTION };
+	rw_trywrlock				{ TYPE = FUNCTION };
+	rw_unlock				{ TYPE = FUNCTION };
+	rw_wrlock				{ TYPE = FUNCTION };
+	sema_destroy				{ TYPE = FUNCTION };
+	sema_init				{ TYPE = FUNCTION };
+	sema_post				{ TYPE = FUNCTION };
+	sema_trywait				{ TYPE = FUNCTION };
+	sema_wait				{ TYPE = FUNCTION };
+	setitimer				{ TYPE = FUNCTION };
+	sigaction				{ TYPE = FUNCTION };
+	siglongjmp				{ TYPE = FUNCTION };
+	sigprocmask				{ TYPE = FUNCTION };
+	sigsetjmp				{ TYPE = FUNCTION };
+	sigsuspend				{ TYPE = FUNCTION };
+	sigwait					{ TYPE = FUNCTION };
+	sleep					{ TYPE = FUNCTION };
+	tcdrain					{ TYPE = FUNCTION };
+	thr_continue				{ TYPE = FUNCTION };
+	thr_create				{ TYPE = FUNCTION };
+	thr_exit				{ TYPE = FUNCTION };
+	thr_getconcurrency			{ TYPE = FUNCTION };
+	thr_getprio				{ TYPE = FUNCTION };
+	thr_getspecific				{ TYPE = FUNCTION };
+	thr_join				{ TYPE = FUNCTION };
+	thr_keycreate				{ TYPE = FUNCTION };
+	thr_kill				{ TYPE = FUNCTION };
+	thr_main				{ TYPE = FUNCTION };
+	thr_min_stack				{ TYPE = FUNCTION };
+	thr_self				{ TYPE = FUNCTION };
+	thr_setconcurrency			{ TYPE = FUNCTION };
+	thr_setprio				{ TYPE = FUNCTION };
+	thr_setspecific				{ TYPE = FUNCTION };
+	thr_sigsetmask				{ TYPE = FUNCTION };
+	thr_stksegment				{ TYPE = FUNCTION };
+	thr_suspend				{ TYPE = FUNCTION };
+	thr_yield				{ TYPE = FUNCTION };
+	wait					{ TYPE = FUNCTION };
+	waitpid					{ TYPE = FUNCTION };
+	write					{ TYPE = FUNCTION };
+};
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+    global:
+	_alarm					{ TYPE = FUNCTION };
+	_fork					{ TYPE = FUNCTION };
+	_mutex_destroy				{ TYPE = FUNCTION };
+	_mutex_init				{ TYPE = FUNCTION };
+	_mutex_unlock				{ TYPE = FUNCTION };
+	_pthread_setcleanupinit			{ TYPE = FUNCTION };
+	_resume					{ TYPE = FUNCTION };
+	_resume_ret				{ TYPE = FUNCTION };
+	_sema_destroy				{ TYPE = FUNCTION };
+	_setitimer				{ TYPE = FUNCTION };
+	_sigaction				{ TYPE = FUNCTION };
+	_siglongjmp				{ TYPE = FUNCTION };
+	_sigprocmask				{ TYPE = FUNCTION };
+	_sigsetjmp				{ TYPE = FUNCTION };
+	_sigsuspend				{ TYPE = FUNCTION };
+	_sleep					{ TYPE = FUNCTION };
+	_thr_create				{ TYPE = FUNCTION };
+	_thr_getspecific			{ TYPE = FUNCTION };
+	_thr_join				{ TYPE = FUNCTION };
+	_thr_keycreate				{ TYPE = FUNCTION };
+	_thr_main				{ TYPE = FUNCTION };
+	thr_probe_setup				{ TYPE = FUNCTION };
+	_thr_self				{ TYPE = FUNCTION };
+	_thr_setspecific			{ TYPE = FUNCTION };
+};
+
diff --git a/usr/src/lib/libpthread/i386/mapfile-vers b/usr/src/lib/libpthread/i386/mapfile-vers
deleted file mode 100644
index a75d89e276..0000000000
--- a/usr/src/lib/libpthread/i386/mapfile-vers
+++ /dev/null
@@ -1,269 +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
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pwrite64 = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	getmsg = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	putpmsg = FUNCTION;
-	lockf = FUNCTION;
-	lockf64 = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	msgrcv = FUNCTION;
-	sigpause = FUNCTION;
-	msgsnd = FUNCTION;
-	pread64 = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	poll = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	putmsg = FUNCTION;
-	pread = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	select = FUNCTION;
-	pwrite = FUNCTION;
-	usleep = FUNCTION;
-	getpmsg = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	wait3 = FUNCTION;
-	readv = FUNCTION;
-	waitid = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	creat64 = FUNCTION;
-	open64 = FUNCTION;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	thr_keycreate = FUNCTION;
-	cond_timedwait = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	fcntl = FUNCTION;
-	pthread_exit = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	sigsuspend = FUNCTION;
-	pthread_attr_destroy = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_kill = FUNCTION;
-	fork = FUNCTION;
-	cond_wait = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_join = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	fork1 = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	thr_main = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	fsync = FUNCTION;
-	pthread_kill = FUNCTION;
-	rw_unlock = FUNCTION;
-	sigwait = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	thr_min_stack = FUNCTION;
-	msync = FUNCTION;
-	mutex_destroy = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	rw_wrlock = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	thr_setspecific = FUNCTION;
-	tcdrain = FUNCTION;
-	open = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	thr_self = FUNCTION;
-	mutex_init = FUNCTION;
-	rwlock_init = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	waitpid = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	thr_setprio = FUNCTION;
-	pause = FUNCTION;
-	mutex_lock = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_once = FUNCTION;
-	sema_post = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	thr_continue = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	pthread_detach = FUNCTION;
-	mutex_trylock = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	sigprocmask = FUNCTION;
-	pthread_self = FUNCTION;
-	sema_trywait = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	thr_create = FUNCTION;
-	cond_broadcast = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	thr_stksegment = FUNCTION;
-	read = FUNCTION;
-	pthread_cancel = FUNCTION;
-	mutex_unlock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	sema_wait = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_exit = FUNCTION;
-	cond_destroy = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	thr_suspend = FUNCTION;
-	pthread_create = FUNCTION;
-	sema_destroy = FUNCTION;
-	setitimer = FUNCTION;
-	_getfp = FUNCTION;
-	sigaction = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	thr_getprio = FUNCTION;
-	cond_init = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_yield = FUNCTION;
-	alarm = FUNCTION;
-	sleep = FUNCTION;
-	sema_init = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	siglongjmp = FUNCTION;
-	thr_join = FUNCTION;
-	close = FUNCTION;
-	wait = FUNCTION;
-	cond_signal = FUNCTION;
-	pthread_equal = FUNCTION;
-	rw_rdlock = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	sigsetjmp = FUNCTION;
-	creat = FUNCTION;
-	write = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	_mutex_lock = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_mutex_unlock = FUNCTION;
-	_thr_main = FUNCTION;
-	_siglongjmp = FUNCTION;
-	_fork = FUNCTION;
-	_setitimer = FUNCTION;
-	_thr_create = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_resume = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_join = FUNCTION;
-	_sigprocmask = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_thr_self = FUNCTION;
-	_sigaction = FUNCTION;
-	_mutex_init = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_resume_ret = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_pthread_setcleanupinit = FUNCTION;
-	_sigsetjmp = FUNCTION;
-};
-
diff --git a/usr/src/lib/libpthread/sparc/mapfile-vers b/usr/src/lib/libpthread/sparc/mapfile-vers
deleted file mode 100644
index 79e51c4840..0000000000
--- a/usr/src/lib/libpthread/sparc/mapfile-vers
+++ /dev/null
@@ -1,269 +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
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	getmsg = FUNCTION;
-	getpmsg = FUNCTION;
-	lockf64 = FUNCTION;
-	lockf = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	poll = FUNCTION;
-	putmsg = FUNCTION;
-	putpmsg = FUNCTION;
-	select = FUNCTION;
-	sigpause = FUNCTION;
-	usleep = FUNCTION;
-	wait3 = FUNCTION;
-	waitid = FUNCTION;
-	pread = FUNCTION;
-	pread64 = FUNCTION;
-	pwrite = FUNCTION;
-	pwrite64 = FUNCTION;
-	readv = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	creat64 = FUNCTION;
-	open64 = FUNCTION;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_destroy = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	pthread_cancel = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_create = FUNCTION;
-	pthread_detach = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_join = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_kill = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	alarm = FUNCTION;
-	close = FUNCTION;
-	cond_broadcast = FUNCTION;
-	cond_destroy = FUNCTION;
-	cond_init = FUNCTION;
-	cond_signal = FUNCTION;
-	cond_timedwait = FUNCTION;
-	cond_wait = FUNCTION;
-	creat = FUNCTION;
-	fcntl = FUNCTION;
-	fork = FUNCTION;
-	fork1 = FUNCTION;
-	fsync = FUNCTION;
-	msync = FUNCTION;
-	mutex_destroy = FUNCTION;
-	mutex_init = FUNCTION;
-	mutex_lock = FUNCTION;
-	mutex_trylock = FUNCTION;
-	mutex_unlock = FUNCTION;
-	open = FUNCTION;
-	pause = FUNCTION;
-	read = FUNCTION;
-	rw_rdlock = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	rw_unlock = FUNCTION;
-	rw_wrlock = FUNCTION;
-	rwlock_init = FUNCTION;
-	sema_destroy = FUNCTION;
-	sema_init = FUNCTION;
-	sema_post = FUNCTION;
-	sema_trywait = FUNCTION;
-	sema_wait = FUNCTION;
-	_getfp = FUNCTION;
-	setitimer = FUNCTION;
-	siglongjmp = FUNCTION;
-	sigsetjmp = FUNCTION;
-	sigaction = FUNCTION;
-	sigprocmask = FUNCTION;
-	sigsuspend = FUNCTION;
-	sigwait = FUNCTION;
-	sleep = FUNCTION;
-	tcdrain = FUNCTION;
-	thr_continue = FUNCTION;
-	thr_create = FUNCTION;
-	thr_exit = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_getprio = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_join = FUNCTION;
-	thr_keycreate = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_main = FUNCTION;
-	thr_min_stack = FUNCTION;
-	thr_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_setprio = FUNCTION;
-	thr_setspecific = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	thr_stksegment = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_yield = FUNCTION;
-	wait = FUNCTION;
-	waitpid = FUNCTION;
-	write = FUNCTION;
-	_mutex_lock = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_pthread_setcleanupinit = FUNCTION;
-	_resume = FUNCTION;
-	_resume_ret = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_fork = FUNCTION;
-	_sigaction = FUNCTION;
-	_sigprocmask = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	_siglongjmp = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_setitimer = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_mutex_init = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_thr_create = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_thr_join = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_self = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_thr_main = FUNCTION;
-};
-
diff --git a/usr/src/lib/libpthread/sparcv9/mapfile-vers b/usr/src/lib/libpthread/sparcv9/mapfile-vers
deleted file mode 100644
index fdaf4c0bfd..0000000000
--- a/usr/src/lib/libpthread/sparcv9/mapfile-vers
+++ /dev/null
@@ -1,265 +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
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	getmsg = FUNCTION;
-	getpmsg = FUNCTION;
-	lockf = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	poll = FUNCTION;
-	putmsg = FUNCTION;
-	putpmsg = FUNCTION;
-	select = FUNCTION;
-	sigpause = FUNCTION;
-	usleep = FUNCTION;
-	wait3 = FUNCTION;
-	waitid = FUNCTION;
-	pread = FUNCTION;
-	pwrite = FUNCTION;
-	readv = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	SUNW_1.1;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_destroy = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	pthread_cancel = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_create = FUNCTION;
-	pthread_detach = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_join = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_kill = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	alarm = FUNCTION;
-	close = FUNCTION;
-	cond_broadcast = FUNCTION;
-	cond_destroy = FUNCTION;
-	cond_init = FUNCTION;
-	cond_signal = FUNCTION;
-	cond_timedwait = FUNCTION;
-	cond_wait = FUNCTION;
-	creat = FUNCTION;
-	fcntl = FUNCTION;
-	fork = FUNCTION;
-	fork1 = FUNCTION;
-	fsync = FUNCTION;
-	msync = FUNCTION;
-	mutex_destroy = FUNCTION;
-	mutex_init = FUNCTION;
-	mutex_lock = FUNCTION;
-	mutex_trylock = FUNCTION;
-	mutex_unlock = FUNCTION;
-	open = FUNCTION;
-	pause = FUNCTION;
-	read = FUNCTION;
-	rw_rdlock = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	rw_unlock = FUNCTION;
-	rw_wrlock = FUNCTION;
-	rwlock_init = FUNCTION;
-	sema_destroy = FUNCTION;
-	sema_init = FUNCTION;
-	sema_post = FUNCTION;
-	sema_trywait = FUNCTION;
-	sema_wait = FUNCTION;
-	_getfp = FUNCTION;
-	setitimer = FUNCTION;
-	siglongjmp = FUNCTION;
-	sigsetjmp = FUNCTION;
-	sigaction = FUNCTION;
-	sigprocmask = FUNCTION;
-	sigsuspend = FUNCTION;
-	sigwait = FUNCTION;
-	sleep = FUNCTION;
-	tcdrain = FUNCTION;
-	thr_continue = FUNCTION;
-	thr_create = FUNCTION;
-	thr_exit = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_getprio = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_join = FUNCTION;
-	thr_keycreate = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_main = FUNCTION;
-	thr_min_stack = FUNCTION;
-	thr_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_setprio = FUNCTION;
-	thr_setspecific = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	thr_stksegment = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_yield = FUNCTION;
-	wait = FUNCTION;
-	waitpid = FUNCTION;
-	write = FUNCTION;
-	_mutex_lock = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_pthread_setcleanupinit = FUNCTION;
-	_resume = FUNCTION;
-	_resume_ret = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_fork = FUNCTION;
-	_sigaction = FUNCTION;
-	_sigprocmask = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	_siglongjmp = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_setitimer = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_mutex_init = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_thr_create = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_thr_join = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_self = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_thr_main = FUNCTION;
-};
-