6924858 various OSNet components could be simplified with symbol capabilities

--HG--
rename : usr/src/lib/libc_psr/Makefile => usr/src/lib/libc/capabilities/Makefile
rename : usr/src/lib/libc_psr/Makefile.targ => usr/src/lib/libc/capabilities/Makefile.targ
rename : usr/src/lib/libc_psr/sun4u-opl/Makefile => usr/src/lib/libc/capabilities/sun4u-opl/Makefile
rename : usr/src/lib/libc_psr/sun4u-opl/Makefile.com => usr/src/lib/libc/capabilities/sun4u-opl/Makefile.com
rename : usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s => usr/src/lib/libc/capabilities/sun4u-opl/common/memcpy.s
rename : usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile => usr/src/lib/libc/capabilities/sun4u-opl/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4u-opl/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap1/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com => usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile.com
rename : usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap2/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile.com
rename : usr/src/lib/libc_psr/sun4u_hwcap2/mapfile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/common/mapfile-cap
rename : usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s => usr/src/lib/libc/capabilities/sun4u-us3/common/memcmp.s
rename : usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s => usr/src/lib/libc/capabilities/sun4u-us3/common/memcpy.s
rename : usr/src/lib/libc_psr/sun4u-us3/common/memset.s => usr/src/lib/libc/capabilities/sun4u-us3/common/memset.s
rename : usr/src/lib/libc_psr/sun4u/Makefile => usr/src/lib/libc/capabilities/sun4u/Makefile
rename : usr/src/lib/libc_psr/sun4u/common/memcmp.s => usr/src/lib/libc/capabilities/sun4u/common/memcmp.s
rename : usr/src/lib/libc_psr/sun4u/common/memcpy.s => usr/src/lib/libc/capabilities/sun4u/common/memcpy.s
rename : usr/src/lib/libc_psr/sun4u/common/memset.s => usr/src/lib/libc/capabilities/sun4u/common/memset.s
rename : usr/src/lib/libc_psr/sun4u/sparc/Makefile => usr/src/lib/libc/capabilities/sun4u/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4u/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4u/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap1/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com => usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile.com
rename : usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap2/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com => usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile.com
rename : usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap2/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap2/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4v/common/memcpy.s => usr/src/lib/libc/capabilities/sun4v/common/memcpy.s
rename : usr/src/lib/libc_psr/sun4v/common/memset.s => usr/src/lib/libc/capabilities/sun4v/common/memset.s
rename : usr/src/lib/libmd/sun4u/Makefile => usr/src/lib/libmd/capabilities/sun4u/Makefile
rename : usr/src/lib/libmd/sun4u/Makefile.com => usr/src/lib/libmd/capabilities/sun4u/Makefile.com
rename : usr/src/lib/libmd/sun4u/sparc/Makefile => usr/src/lib/libmd/capabilities/sun4u/sparc/Makefile
rename : usr/src/lib/libmd/sun4u/sparcv9/Makefile => usr/src/lib/libmd/capabilities/sun4u/sparcv9/Makefile
rename : usr/src/lib/libmd/sun4v/Makefile => usr/src/lib/libmd/capabilities/sun4v/Makefile
rename : usr/src/lib/libmd/sun4v/Makefile.com => usr/src/lib/libmd/capabilities/sun4v/Makefile.com
rename : usr/src/lib/libmd/sun4v/sparc/Makefile => usr/src/lib/libmd/capabilities/sun4v/sparc/Makefile
rename : usr/src/lib/libmd/sun4v/sparcv9/Makefile => usr/src/lib/libmd/capabilities/sun4v/sparcv9/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/i386_hwcap1/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile.com => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.com
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/mapfile-vers => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/common/mapfile-cap
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/sparc/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/sparc/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/sparcv9/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/sparcv9/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile.com => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/mapfile-vers => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/common/mapfile-cap
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/sparc/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparc/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/sparcv9/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparcv9/Makefile

3 files changed, 3 insertions, 15 deletions

diff --git a/usr/src/uts/sun4u/schumacher/Makefile b/usr/src/uts/sun4u/schumacher/Makefile
index 6b5fcc772e..04df3916b3 100644
--- a/usr/src/uts/sun4u/schumacher/Makefile
+++ b/usr/src/uts/sun4u/schumacher/Makefile
@@ -18,10 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #	This makefile drives the production of the sun4u schumacher platform
 #	module.
@@ -67,7 +64,6 @@ install:	$(ROOT_SCHUMACHER_DIR) \
 		$(USR_SCHUMACHER_INC_DIR) \
 		$(USR_SCHUMACHER_SBIN_DIR) \
 		$(USR_SCHUMACHER_SBIN_PRTDIAG) \
-		$(USR_SCHUMACHER_SBIN_TRAPSTAT) \
 		$(USR_SCHUMACHER_SBIN_FRUADM) \
 		$(USR_SCHUMACHER_LIB_DIR) \
 		$(SCHUMACHER_CRYPTO_LINKS) \
diff --git a/usr/src/uts/sun4u/schumacher/Makefile.schumacher b/usr/src/uts/sun4u/schumacher/Makefile.schumacher
index b250779b6d..5eb26050a1 100644
--- a/usr/src/uts/sun4u/schumacher/Makefile.schumacher
+++ b/usr/src/uts/sun4u/schumacher/Makefile.schumacher
@@ -18,10 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #	Global definitions for sun4u implementation specific modules.
 #
@@ -52,7 +49,6 @@ USR_SCHUMACHER_INC_DIR	= $(USR_SCHUMACHER_DIR)/include
 USR_SCHUMACHER_ISYS_DIR	= $(USR_SCHUMACHER_INC_DIR)/sys
 USR_SCHUMACHER_SBIN_DIR	= $(USR_SCHUMACHER_DIR)/sbin
 USR_SCHUMACHER_SBIN_PRTDIAG = $(USR_SCHUMACHER_SBIN_DIR)/prtdiag
-USR_SCHUMACHER_SBIN_TRAPSTAT = $(USR_SCHUMACHER_SBIN_DIR)/trapstat
 USR_SCHUMACHER_SBIN_FRUADM = $(USR_SCHUMACHER_SBIN_DIR)/fruadm
 USR_SCHUMACHER_LIB_DIR	= $(USR_SCHUMACHER_DIR)/lib
 
diff --git a/usr/src/uts/sun4u/schumacher/Makefile.targ b/usr/src/uts/sun4u/schumacher/Makefile.targ
index e366b89aeb..e61bc0d213 100644
--- a/usr/src/uts/sun4u/schumacher/Makefile.targ
+++ b/usr/src/uts/sun4u/schumacher/Makefile.targ
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #	Common targets for sun4u implementation specific modules.
 #
@@ -67,9 +66,6 @@ $(USR_SCHUMACHER_SBIN_DIR): $(USR_SCHUMACHER_DIR)
 $(USR_SCHUMACHER_SBIN_PRTDIAG): $(USR_SCHUMACHER_SBIN_DIR)
 	$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
 
-$(USR_SCHUMACHER_SBIN_TRAPSTAT): $(USR_SCHUMACHER_SBIN_DIR)
-	$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
-
 $(USR_SCHUMACHER_SBIN_FRUADM): $(USR_SCHUMACHER_SBIN_DIR)
 	$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@