6470132 sn1 zone always tried to pre_load /usr/lib/amd64/sn1_brand.so on sparcv9.

6470732 sn1 brand should 'make clobber' more thoroughly
6471923 sn1 brand should not emulate fork1()

9 files changed, 8 insertions, 26 deletions

diff --git a/usr/src/lib/brand/lx/netfiles/Makefile b/usr/src/lib/brand/lx/netfiles/Makefile
index 7c442c9c57..47be18db0f 100644
--- a/usr/src/lib/brand/lx/netfiles/Makefile
+++ b/usr/src/lib/brand/lx/netfiles/Makefile
@@ -40,7 +40,7 @@ install: $(ROOTTXTS)
 clean:
 	-$(RM) etc_default_nfs
 
-clobber:
+clobber: clean
 	-$(RM) $(ROOTXMLDOCS) $(ROOTTXTS)
 
 etc_default_nfs: $(NFS_DFL)
diff --git a/usr/src/lib/brand/native/zone/Makefile b/usr/src/lib/brand/native/zone/Makefile
index b60c46df66..6912c2dd0f 100644
--- a/usr/src/lib/brand/native/zone/Makefile
+++ b/usr/src/lib/brand/native/zone/Makefile
@@ -52,7 +52,7 @@ install: $(PROGS) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
 clean:
 	-$(RM) $(PROGS)
 
-clobber:
+clobber: clean
 	-$(RM) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
 
 include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/brand/sn1/amd64/sn1_handler.s b/usr/src/lib/brand/sn1/amd64/sn1_handler.s
index 00a1a83f76..f88c46d3b6 100644
--- a/usr/src/lib/brand/sn1/amd64/sn1_handler.s
+++ b/usr/src/lib/brand/sn1/amd64/sn1_handler.s
@@ -254,7 +254,7 @@ sn1_sysent_table:
 	NOSYS					/* 140 */
 	NOSYS					/* 141 */
 	NOSYS					/* 142 */
-	EMULATE(sn1_fork1, RVAL2_FLAG | 0)	/* 143 */
+	NOSYS					/* 143 */
 	NOSYS					/* 144 */
 	NOSYS					/* 145 */
 	NOSYS					/* 146 */
diff --git a/usr/src/lib/brand/sn1/common/sn1_brand.c b/usr/src/lib/brand/sn1/common/sn1_brand.c
index 75130f8fb7..088e0f6b9d 100644
--- a/usr/src/lib/brand/sn1/common/sn1_brand.c
+++ b/usr/src/lib/brand/sn1/common/sn1_brand.c
@@ -39,23 +39,6 @@
 
 extern int errno;
 
-longlong_t
-sn1_fork1()
-{
-	sysret_t rval;
-	longlong_t r;
-	int err;
-
-	err = __systemcall(&rval, SYS_fork1 + 1024);
-
-	if (err) {
-		r = ((-1ll) << 32) | (-err);
-		return (r);
-	}
-	r = ((longlong_t)rval.sys_rval2 << 32) | rval.sys_rval1;
-	return (r);
-}
-
 int
 sn1_uname(uintptr_t p1)
 {
diff --git a/usr/src/lib/brand/sn1/i386/sn1_handler.s b/usr/src/lib/brand/sn1/i386/sn1_handler.s
index 13100ac8e1..decc218412 100644
--- a/usr/src/lib/brand/sn1/i386/sn1_handler.s
+++ b/usr/src/lib/brand/sn1/i386/sn1_handler.s
@@ -273,7 +273,7 @@ sn1_sysent_table:
 	NOSYS					/* 140 */
 	NOSYS					/* 141 */
 	NOSYS					/* 142 */
-	EMULATE(sn1_fork1, 0)			/* 143 */
+	NOSYS					/* 143 */
 	NOSYS					/* 144 */
 	NOSYS					/* 145 */
 	NOSYS					/* 146 */
diff --git a/usr/src/lib/brand/sn1/sparc/sn1_handler.s b/usr/src/lib/brand/sn1/sparc/sn1_handler.s
index 235b29abd8..114a28b863 100644
--- a/usr/src/lib/brand/sn1/sparc/sn1_handler.s
+++ b/usr/src/lib/brand/sn1/sparc/sn1_handler.s
@@ -304,7 +304,7 @@ sn1_sysent_table:
 	NOSYS					/* 140 */
 	NOSYS					/* 141 */
 	NOSYS					/* 142 */
-	EMULATE(sn1_fork1, RVAL2_FLAG | 0)	/* 143 */
+	NOSYS					/* 143 */
 	NOSYS					/* 144 */
 	NOSYS					/* 145 */
 	NOSYS					/* 146 */
diff --git a/usr/src/lib/brand/sn1/zone/Makefile b/usr/src/lib/brand/sn1/zone/Makefile
index 812c88f16a..97b85f9be6 100644
--- a/usr/src/lib/brand/sn1/zone/Makefile
+++ b/usr/src/lib/brand/sn1/zone/Makefile
@@ -42,5 +42,5 @@ clean:
 
 install: $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
 
-clobber:
+clobber: clean
 	-$(RM) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
diff --git a/usr/src/lib/brand/sn1/zone/sn1_boot.sh b/usr/src/lib/brand/sn1/zone/sn1_boot.sh
index d1f47532c4..a1a656c7c7 100644
--- a/usr/src/lib/brand/sn1/zone/sn1_boot.sh
+++ b/usr/src/lib/brand/sn1/zone/sn1_boot.sh
@@ -34,9 +34,9 @@ PATH=/sbin:/usr/bin:/usr/sbin; export PATH
 
 ZONEROOT=$1
 
-if [ `uname -p` -eq "i386" ]; then
+if [ `uname -p` = "i386" ]; then
         ARCH64=amd64
-elif [ `uname -p` -eq "sparc" ]; then
+elif [ `uname -p` = "sparc" ]; then
         ARCH64=sparcv9
 else
         echo "Unsupported architecture: " `uname -p`
diff --git a/usr/src/uts/common/brand/sn1/sn1_brand.c b/usr/src/uts/common/brand/sn1/sn1_brand.c
index a46ea3c979..1ad8a52135 100644
--- a/usr/src/uts/common/brand/sn1/sn1_brand.c
+++ b/usr/src/uts/common/brand/sn1/sn1_brand.c
@@ -247,7 +247,6 @@ _init(void)
 	 */
 	sn1_emulation_table = kmem_zalloc(NSYSCALL, KM_SLEEP);
 	sn1_emulation_table[SYS_uname] = 1;
-	sn1_emulation_table[SYS_fork1] = 1;
 
 	err = mod_install(&modlinkage);
 	if (err) {