6411190 libc_psr/sun4u-opl/common/memcpy.s listed as unref file in build noise

9 files changed, 52 insertions, 30 deletions

diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index d1e77e3cff..036b228d34 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -283,7 +283,8 @@ sparcv9_ROOT.BIN64= \
 	/platform/sun4v/lib/$(MACH64) \
 	/usr/platform/sun4v/sbin \
 	/usr/platform/sun4v/lib \
-	/usr/platform/sun4u-us3/lib
+	/usr/platform/sun4u-us3/lib \
+	/usr/platform/sun4u-opl/lib
 
 amd64_ROOT.BIN64=
 
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile b/usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile
index edd059ba21..5d45224c42 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile
+++ b/usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile
@@ -31,8 +31,7 @@
 LIBRARY	=	libc_psr.a
 VERS	=	.1
 
-PLATFORM=	SUNW,SPARC-Enterprise
-ALT_PLAT=	sun4u-opl
+PLATFORM=	sun4u-opl
 CLASS	=	32
 
 OBJECTS	=	c_psr-$(MACH).o
@@ -40,7 +39,7 @@ OBJECTS	=	c_psr-$(MACH).o
 SPECVERS =	-$(MACH)
 
 include	$(SRC)/lib/Makefile.lib
-include $(SRC)/lib/libc_psr/spec/$(ALT_PLAT)/Makefile.links
+include $(SRC)/lib/libc_psr/spec/$(PLATFORM)/Makefile.links
 
 # Uncomment the following if the linker complains
 #sparc_C_PICFLAGS  = -K PIC
@@ -48,4 +47,4 @@ include $(SRC)/lib/libc_psr/spec/$(ALT_PLAT)/Makefile.links
 include	$(SRC)/lib/Makefile.spec
 include	$(SRC)/lib/Makefile.spec.psm
 
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
+install:
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile b/usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile
index 557004d67e..66d6473c41 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile
@@ -30,8 +30,7 @@
 LIBRARY	=	libc_psr.a
 VERS	=	.1
 
-PLATFORM=	SUNW,SPARC-Enterprise
-ALT_PLAT=	sun4u-opl
+PLATFORM=	sun4u-opl
 CLASS	=	64
 
 OBJECTS	=	c_psr-$(MACH64).o
@@ -40,7 +39,7 @@ SPECVERS=	-$(MACH64)
 
 include	$(SRC)/lib/Makefile.lib
 include	$(SRC)/lib/Makefile.lib.64
-include $(SRC)/lib/libc_psr/spec/$(ALT_PLAT)/Makefile.links
+include $(SRC)/lib/libc_psr/spec/$(PLATFORM)/Makefile.links
 
 # Uncomment the following if the linker complains
 #sparcv9_C_PICFLAGS  = -K PIC
@@ -48,4 +47,4 @@ include $(SRC)/lib/libc_psr/spec/$(ALT_PLAT)/Makefile.links
 include	$(SRC)/lib/Makefile.spec
 include	$(SRC)/lib/Makefile.spec.psm
 
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
+install:
diff --git a/usr/src/lib/libc_psr/sun4u-opl/Makefile b/usr/src/lib/libc_psr/sun4u-opl/Makefile
index 65799c0b96..b114f86ba0 100644
--- a/usr/src/lib/libc_psr/sun4u-opl/Makefile
+++ b/usr/src/lib/libc_psr/sun4u-opl/Makefile
@@ -27,10 +27,10 @@
 # lib/libc_psr/sun4u-opl/Makefile
 #
 
-include ../../Makefile.lib
+include $(SRC)/lib/Makefile.lib
+include $(SRC)/Makefile.psm
 
-PLATFORM=	SUNW,SPARC-Enterprise
-ALT_PLAT=	sun4u-opl
+PLATFORM=	sun4u-opl
 
 SUBDIRS=	$(MACH)
 SUBDIRS64=	$(MACH64)
@@ -40,10 +40,34 @@ install		:=	TARGET= install
 clean		:=	TARGET= clean
 clobber		:=	TARGET= clobber
 
-.KEEP_STATE:
+MODULE		= libc_psr.so.1
+LIBC_PSR_DIRS	= $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib)
+LIBC_PSR_LINKS	= $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE))
+INS.slink6	= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+LIBC_PSR64_DIRS	= $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64))
+LIBC_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE))
+INS.slink7	= $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
 
-all install clean clobber : lib32 \
-				$(BUILD64) lib64
+#
+# Used when building links in /platform/$(PLATFORM)/lib
+#
+LINKED_PLATFORMS	= SUNW,SPARC-Enterprise
+
+all install: lib32 $(BUILD64) lib64 $(LIBC_PSR_LINKS) $(LIBC_PSR64_LINKS)
+
+clean clobber: lib32 $(BUILD64) lib64
+
+$(LIBC_PSR_DIRS):
+	-$(INS.dir.root.bin)
+
+$(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS)
+	-$(INS.slink6)
+
+$(LIBC_PSR64_DIRS):
+	-$(INS.dir.root.bin)
+
+$(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS)
+	-$(INS.slink7)
 
 lint:
 	@ $(ECHO) "Nothing to lint here: skipping"
@@ -56,6 +80,6 @@ $(SUBDIRS) $(SUBDIRS64): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 spec: FRC
-	@cd ../spec/$(ALT_PLAT); pwd; $(MAKE) $(TARGET)
+	@cd ../spec/$(PLATFORM); pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libc_psr/sun4u-opl/Makefile.com b/usr/src/lib/libc_psr/sun4u-opl/Makefile.com
index c2cb4edd2d..64760d301c 100644
--- a/usr/src/lib/libc_psr/sun4u-opl/Makefile.com
+++ b/usr/src/lib/libc_psr/sun4u-opl/Makefile.com
@@ -50,11 +50,6 @@ ASDEFS		= -D__STDC__ -D_ASM $(CPPFLAGS)
 ASFLAGS		= -P $(ASDEFS)
 
 #
-# Used when building links in /platform/$(PLATFORM)/lib
-#
-LINKED_PLATFORMS	= SUNW,SPARC-Enterprise
-
-#
 # install rule
 #
 $(ROOT_PSM_LIB_DIR)/%: % $(ROOT_PSM_LIB_DIR)
diff --git a/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile b/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile
index 2eb91a6117..eebe2596fe 100644
--- a/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile
+++ b/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile
@@ -26,9 +26,7 @@
 #
 # Platform specific Makefile for libc_psr.
 #
-PLATFORM	= SUNW,SPARC-Enterprise
-ALT_PLAT	= sun4u-opl
-
+PLATFORM	= sun4u-opl
 COMPAT_PLAT	= sun4u-us3
 CLASS		= 32
 
@@ -36,7 +34,7 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(ALT_PLAT)/$(MACH)
+MAPDIR=		../../spec/$(PLATFORM)/$(MACH)
 MAPFILE=	$(MAPDIR)/mapfile-$(MACH)
 MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR)
 MAPOPTS=	$(MAPFILES:%=-M %)
diff --git a/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile
index 7c6de5d904..2288434a56 100644
--- a/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile
@@ -26,8 +26,7 @@
 #
 # Platform specific Makefile for libc_psr.
 #
-PLATFORM	= SUNW,SPARC-Enterprise
-ALT_PLAT	= sun4u-opl
+PLATFORM	= sun4u-opl
 COMPAT_PLAT	= sun4u-us3
 CLASS		= 64
 
@@ -35,7 +34,7 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(ALT_PLAT)/$(MACH64)
+MAPDIR=		../../spec/$(PLATFORM)/$(MACH64)
 MAPFILE=	$(MAPDIR)/mapfile-$(MACH64)
 MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR)
 MAPOPTS=	$(MAPFILES:%=-M %)
diff --git a/usr/src/pkgdefs/SUNWcar.u/prototype_com b/usr/src/pkgdefs/SUNWcar.u/prototype_com
index 601322484f..a38eb7c31f 100644
--- a/usr/src/pkgdefs/SUNWcar.u/prototype_com
+++ b/usr/src/pkgdefs/SUNWcar.u/prototype_com
@@ -53,6 +53,7 @@ d none etc/flash/preexit 700 root sys
 d none etc/flash/postcreation 700 root sys
 f none etc/flash/precreation/caplib 500 root sys
 d none platform 755 root sys
+d none platform/sun4u-opl 755 root sys
 d none platform/sun4u-us3 755 root sys
 d none platform/SUNW,Netra-T12 755 root sys
 d none platform/SUNW,Netra-T4 755 root sys
@@ -133,13 +134,15 @@ d none platform/SUNW,UltraSPARC-IIi-Netract/lib/sparcv9 755 root bin
 d none platform/SUNW,Netra-CP2300/lib/sparcv9 755 root bin
 d none platform/SUNW,Netra-CP3010/lib/sparcv9 755 root bin
 d none platform/SUNW,SPARC-Enterprise/lib/sparcv9 755 root bin
-f none platform/SUNW,SPARC-Enterprise/lib/sparcv9/libc_psr.so.1 755 root bin
 d none platform/sun4u-us3/lib/sparcv9 755 root bin
 d none platform/sun4u-us3/lib/sparcv9/libc_psr 755 root bin
 f none platform/sun4u/lib/sparcv9/libc_psr.so.1 755 root bin
 v none platform/sun4u-us3/lib/sparcv9/libc_psr.so.1 755 root bin
 f none platform/sun4u-us3/lib/sparcv9/libc_psr/libc_psr_hwcap1.so.1 755 root bin
 f none platform/sun4u-us3/lib/sparcv9/libc_psr/libc_psr_hwcap2.so.1 755 root bin
+d none platform/sun4u-opl/lib/sparcv9 755 root bin
+f none platform/sun4u-opl/lib/sparcv9/libc_psr.so.1 755 root bin
+s none platform/SUNW,SPARC-Enterprise/lib/sparcv9/libc_psr.so.1=../../../sun4u-opl/lib/sparcv9/libc_psr.so.1
 s none platform/SUNW,Netra-T12/lib/sparcv9/libc_psr.so.1=../../../sun4u-us3/lib/sparcv9/libc_psr.so.1
 s none platform/SUNW,Netra-T4/lib/sparcv9/libc_psr.so.1=../../../sun4u-us3/lib/sparcv9/libc_psr.so.1
 s none platform/SUNW,Serverblade1/lib/sparcv9/libc_psr.so.1=../../../sun4u/lib/sparcv9/libc_psr.so.1
@@ -245,13 +248,15 @@ d none platform/SUNW,UltraSPARC-IIi-Netract/lib 755 root bin
 d none platform/SUNW,Netra-CP2300/lib 755 root bin
 d none platform/SUNW,Netra-CP3010/lib 755 root bin
 d none platform/SUNW,SPARC-Enterprise/lib 755 root bin
-f none platform/SUNW,SPARC-Enterprise/lib/libc_psr.so.1 755 root bin
 f none platform/sun4u/lib/libc_psr.so.1 755 root bin
 d none platform/sun4u-us3/lib 755 root sys
 v none platform/sun4u-us3/lib/libc_psr.so.1 755 root bin
 d none platform/sun4u-us3/lib/libc_psr 755 root sys
 f none platform/sun4u-us3/lib/libc_psr/libc_psr_hwcap1.so.1 755 root bin
 f none platform/sun4u-us3/lib/libc_psr/libc_psr_hwcap2.so.1 755 root bin
+d none platform/sun4u-opl/lib 755 root sys
+f none platform/sun4u-opl/lib/libc_psr.so.1 755 root bin
+s none platform/SUNW,SPARC-Enterprise/lib/libc_psr.so.1=../../sun4u-opl/lib/libc_psr.so.1
 s none platform/SUNW,Ultra-2/lib/libc_psr.so.1=../../sun4u/lib/libc_psr.so.1
 s none platform/SUNW,Ultra-250/lib/libc_psr.so.1=../../sun4u/lib/libc_psr.so.1
 s none platform/SUNW,Ultra-30/lib/libc_psr.so.1=../../sun4u/lib/libc_psr.so.1
diff --git a/usr/src/pkgdefs/SUNWkvm.u/prototype_com b/usr/src/pkgdefs/SUNWkvm.u/prototype_com
index 234ac77595..98442c76c6 100644
--- a/usr/src/pkgdefs/SUNWkvm.u/prototype_com
+++ b/usr/src/pkgdefs/SUNWkvm.u/prototype_com
@@ -46,6 +46,7 @@ d none usr 755 root sys
 d none usr/platform 755 root sys
 d none usr/platform/sun4u 755 root sys
 d none usr/platform/sun4u-us3 755 root sys
+d none usr/platform/sun4u-opl 755 root sys
 #
 # other platform directories
 #
@@ -172,6 +173,7 @@ s none usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/libprtdiag_psr.so.1=../..
 #
 d none usr/platform/sun4u/lib 755 root bin
 d none usr/platform/sun4u-us3/lib 755 root bin
+d none usr/platform/sun4u-opl/lib 755 root bin
 d none usr/platform/SUNW,SPARC-Enterprise/lib 755 root bin
 d none usr/platform/SUNW,Ultra-2/lib 755 root bin
 d none usr/platform/SUNW,Ultra-250/lib 755 root bin