14938 pvs(1) should be 64bit only

Reviewed by: Andy Fiddaman <illumos@fiddaman.net>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>

9 files changed, 19 insertions, 100 deletions

diff --git a/usr/src/cmd/sgs/pvs/Makefile b/usr/src/cmd/sgs/pvs/Makefile
index 3fb5c9663e..51aa02ad48 100644
--- a/usr/src/cmd/sgs/pvs/Makefile
+++ b/usr/src/cmd/sgs/pvs/Makefile
@@ -20,9 +20,9 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1996 by Sun Microsystems, Inc.
 # All rights reserved.
 
+BUILD32 = $(POUND_SIGN)
+
 include		$(SRC)/cmd/sgs/Makefile.sub
diff --git a/usr/src/cmd/sgs/pvs/Makefile.com b/usr/src/cmd/sgs/pvs/Makefile.com
index 0e7cad8a62..9028a46c71 100644
--- a/usr/src/cmd/sgs/pvs/Makefile.com
+++ b/usr/src/cmd/sgs/pvs/Makefile.com
@@ -43,11 +43,9 @@ MAPFILE=	$(MAPFILE.NGB)
 MAPOPTS=	$(MAPFILE:%=-Wl,-M%)
 
 CPPFLAGS +=	-I$(SRC)/lib/libc/inc
-LLDFLAGS =	'-R$$ORIGIN/../lib'
-LLDFLAGS64 =	'-R$$ORIGIN/../../lib/$(MACH64)'
-LDFLAGS +=	$(VERSREF) $(MAPOPTS) $(LLDFLAGS)
-LDLIBS +=	$(LDDBGLIBDIR) -llddbg $(ELFLIBDIR) -lelf \
-		    $(CONVLIBDIR) -lconv
+LDFLAGS +=	$(VERSREF) $(MAPOPTS) '-R$$ORIGIN/../../lib/$(MACH64)'
+LDLIBS +=	$(LDDBGLIBDIR64) -llddbg $(ELFLIBDIR64) -lelf \
+		    $(CONVLIBDIR64) -lconv
 
 # not linted
 SMATCH=off
diff --git a/usr/src/cmd/sgs/pvs/Makefile.targ b/usr/src/cmd/sgs/pvs/Makefile.targ
index 2ae435d8d1..c219b2692e 100644
--- a/usr/src/cmd/sgs/pvs/Makefile.targ
+++ b/usr/src/cmd/sgs/pvs/Makefile.targ
@@ -26,23 +26,26 @@
 #
 
 %.o:		../common/%.c
-		$(COMPILE.c) $<
-		$(POST_PROCESS_O)
+	$(COMPILE.c) $<
+	$(POST_PROCESS_O)
 
 %.o:		$(SGSCOMMON)/%.c
-		$(COMPILE.c) -o $@ $<
-		$(POST_PROCESS_O)
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
 
 all:		$(PROG)
 
 clean:
-		$(RM) $(OBJS) $(CLEANFILES)
+	$(RM) $(OBJS) $(CLEANFILES)
 
-install:	all $(ROOTPROG)
+install:	all $(ROOTPROG) $(ROOTPROG64)
+
+$(ROOTPROG64):
+	$(RM) $@; $(SYMLINK) ../../bin/pvs $@
 
 $(PROG):	$(OBJS)  $(MAPFILE)
-		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
-		$(POST_PROCESS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
+	$(POST_PROCESS)
 
 include		$(SRC)/cmd/Makefile.targ
 
@@ -51,7 +54,7 @@ include		$(SRC)/cmd/Makefile.targ
 catalog:	$(BLTMESG)
 
 chkmsg:		$(SRCS)
-		sh $(CHKMSG) $(CHKMSGFLAGS) $(SRCS)
+	sh $(CHKMSG) $(CHKMSGFLAGS) $(SRCS)
 
 $(BLTDEFS) + \
 $(BLTDATA) + \
diff --git a/usr/src/cmd/sgs/pvs/amd64/Makefile b/usr/src/cmd/sgs/pvs/amd64/Makefile
index 5589534272..e20dcd744a 100644
--- a/usr/src/cmd/sgs/pvs/amd64/Makefile
+++ b/usr/src/cmd/sgs/pvs/amd64/Makefile
@@ -30,12 +30,5 @@ include		../Makefile.com
 
 .KEEP_STATE:
 
-LLDFLAGS =	$(LLDFLAGS64)
-CONVLIBDIR =	$(CONVLIBDIR64)
-ELFLIBDIR =	$(ELFLIBDIR64)
-LDDBGLIBDIR =	$(LDDBGLIBDIR64)
-
-ROOTPROG =	$(ROOTPROG64)
-
 include		../Makefile.targ
 include		$(SRC)/Makefile.master.64
diff --git a/usr/src/cmd/sgs/pvs/common/pvs.c b/usr/src/cmd/sgs/pvs/common/pvs.c
index 5a53021e09..46af805167 100644
--- a/usr/src/cmd/sgs/pvs/common/pvs.c
+++ b/usr/src/cmd/sgs/pvs/common/pvs.c
@@ -1017,11 +1017,6 @@ main(int argc, char **argv, char **envp)
 	const Gver_sym_data	*vsdata = NULL;
 
 	/*
-	 * Check for a binary that better fits this architecture.
-	 */
-	(void) conv_check_native(argv, envp);
-
-	/*
 	 * Establish locale.
 	 */
 	(void) setlocale(LC_MESSAGES, MSG_ORIG(MSG_STR_EMPTY));
diff --git a/usr/src/cmd/sgs/pvs/i386/Makefile b/usr/src/cmd/sgs/pvs/i386/Makefile
deleted file mode 100644
index e7beceaa98..0000000000
--- a/usr/src/cmd/sgs/pvs/i386/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (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
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1994 by Sun Microsystems, Inc.
-#
-
-include		../Makefile.com
-
-.KEEP_STATE:
-
-include		../Makefile.targ
diff --git a/usr/src/cmd/sgs/pvs/sparc/Makefile b/usr/src/cmd/sgs/pvs/sparc/Makefile
deleted file mode 100644
index e7beceaa98..0000000000
--- a/usr/src/cmd/sgs/pvs/sparc/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (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
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1994 by Sun Microsystems, Inc.
-#
-
-include		../Makefile.com
-
-.KEEP_STATE:
-
-include		../Makefile.targ
diff --git a/usr/src/cmd/sgs/pvs/sparcv9/Makefile b/usr/src/cmd/sgs/pvs/sparcv9/Makefile
index 15a4a6972d..e20dcd744a 100644
--- a/usr/src/cmd/sgs/pvs/sparcv9/Makefile
+++ b/usr/src/cmd/sgs/pvs/sparcv9/Makefile
@@ -18,6 +18,7 @@
 #
 # CDDL HEADER END
 #
+
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -29,12 +30,5 @@ include		../Makefile.com
 
 .KEEP_STATE:
 
-LLDFLAGS =	$(LLDFLAGS64)
-CONVLIBDIR =	$(CONVLIBDIR64)
-ELFLIBDIR =	$(ELFLIBDIR64)
-LDDBGLIBDIR =	$(LDDBGLIBDIR64)
-
-ROOTPROG =	$(ROOTPROG64)
-
 include		../Makefile.targ
 include		$(SRC)/Makefile.master.64
diff --git a/usr/src/pkg/manifests/developer-linker.p5m b/usr/src/pkg/manifests/developer-linker.p5m
index a827118d39..b5b3537826 100644
--- a/usr/src/pkg/manifests/developer-linker.p5m
+++ b/usr/src/pkg/manifests/developer-linker.p5m
@@ -43,7 +43,7 @@ file path=usr/bin/$(ARCH64)/gcore mode=0555
 link path=usr/bin/$(ARCH64)/ld target=../../bin/ld
 link path=usr/bin/$(ARCH64)/ldd target=../../bin/ldd
 file path=usr/bin/$(ARCH64)/plimit mode=0555
-file path=usr/bin/$(ARCH64)/pvs mode=0555
+link path=usr/bin/$(ARCH64)/pvs target=../../bin/pvs
 file path=usr/bin/$(ARCH64)/strings mode=0555
 file path=usr/bin/$(ARCH64)/truss mode=0555
 link path=usr/bin/ctags target=../has/bin/ctags mediator=ctags \