14793 dump(1) should be 64bit only

Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Garrett D'Amore <garrett@damore.org>

8 files changed, 15 insertions, 95 deletions

diff --git a/usr/src/cmd/sgs/dump/Makefile b/usr/src/cmd/sgs/dump/Makefile
index 745dc3e005..a83ee1a5d7 100644
--- a/usr/src/cmd/sgs/dump/Makefile
+++ b/usr/src/cmd/sgs/dump/Makefile
@@ -20,10 +20,9 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1994 by Sun Microsystems, Inc.
 #
-# cmd/sgs/dump/Makefile
+
+BUILD32 = $(POUND_SIGN)
 
 include		../Makefile.sub
diff --git a/usr/src/cmd/sgs/dump/Makefile.com b/usr/src/cmd/sgs/dump/Makefile.com
index 6fee454721..96a6b4aa58 100644
--- a/usr/src/cmd/sgs/dump/Makefile.com
+++ b/usr/src/cmd/sgs/dump/Makefile.com
@@ -40,12 +40,10 @@ OBJS =		$(COMOBJS)
 .PARALLEL:	$(OBJS)
 
 CPPFLAGS +=	-D__EXTENSIONS__
-LLDFLAGS =	'$(LDPASS)-R$$ORIGIN/../../lib'
-LLDFLAGS64 =	'$(LDPASS)-R$$ORIGIN/../../../lib/$(MACH64)'
-LDFLAGS +=	$(LLDFLAGS)
+LDFLAGS +=	'-R$$ORIGIN/../../lib/$(MACH64)'
 
 CERRWARN +=	$(CNOWARN_UNINIT)
 
 SMOFF += indenting
 
-LDLIBS +=	$(CONVLIBDIR) -lconv $(ELFLIBDIR) -lelf
+LDLIBS +=	$(CONVLIBDIR64) -lconv $(ELFLIBDIR64) -lelf
diff --git a/usr/src/cmd/sgs/dump/amd64/Makefile b/usr/src/cmd/sgs/dump/amd64/Makefile
index 10cef7c92d..20455f057c 100644
--- a/usr/src/cmd/sgs/dump/amd64/Makefile
+++ b/usr/src/cmd/sgs/dump/amd64/Makefile
@@ -30,14 +30,11 @@ include		../Makefile.com
 
 .KEEP_STATE:
 
-LLDFLAGS =	$(LLDFLAGS64)
-ELFLIBDIR =	$(ELFLIBDIR64)
-CONVLIBDIR =	$(CONVLIBDIR64)
-
-ROOTPROG=	$(ROOTPROG64)
-ROOTCCSBINLINK=	$(ROOTCCSBINLINK64)
-
 include		../Makefile.targ
 include		$(SRC)/Makefile.master.64
 
-install:	$(ROOTPROG64)
+install:	$(ROOTPROG) $(ROOTPROG64) \
+	$(ROOTCCSBINLINK) $(ROOTCCSBINLINK64)
+
+$(ROOTBIN64)/dump:
+	$(RM) $@; $(SYMLINK) ../../bin/dump $@
diff --git a/usr/src/cmd/sgs/dump/common/dump.c b/usr/src/cmd/sgs/dump/common/dump.c
index 204c0d52f1..20acf25d3d 100644
--- a/usr/src/cmd/sgs/dump/common/dump.c
+++ b/usr/src/cmd/sgs/dump/common/dump.c
@@ -2010,11 +2010,6 @@ main(int argc, char *argv[], char *envp[])
 	char *optstr = OPTSTR; /* option string used by getopt() */
 	int optchar;
 
-	/*
-	 * Check for a binary that better fits this architecture.
-	 */
-	(void) conv_check_native(argv, envp);
-
 	prog_name = argv[0];
 
 	(void) setlocale(LC_ALL, "");
diff --git a/usr/src/cmd/sgs/dump/i386/Makefile b/usr/src/cmd/sgs/dump/i386/Makefile
deleted file mode 100644
index ba0a4032e6..0000000000
--- a/usr/src/cmd/sgs/dump/i386/Makefile
+++ /dev/null
@@ -1,33 +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 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
-#
-
-include		../Makefile.com
-
-.KEEP_STATE:
-
-include		../Makefile.targ
diff --git a/usr/src/cmd/sgs/dump/sparc/Makefile b/usr/src/cmd/sgs/dump/sparc/Makefile
deleted file mode 100644
index ba0a4032e6..0000000000
--- a/usr/src/cmd/sgs/dump/sparc/Makefile
+++ /dev/null
@@ -1,33 +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 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
-#
-
-include		../Makefile.com
-
-.KEEP_STATE:
-
-include		../Makefile.targ
diff --git a/usr/src/cmd/sgs/dump/sparcv9/Makefile b/usr/src/cmd/sgs/dump/sparcv9/Makefile
index 5632b0ecf0..20455f057c 100644
--- a/usr/src/cmd/sgs/dump/sparcv9/Makefile
+++ b/usr/src/cmd/sgs/dump/sparcv9/Makefile
@@ -30,14 +30,11 @@ include		../Makefile.com
 
 .KEEP_STATE:
 
-LLDFLAGS =	$(LLDFLAGS64)
-ELFLIBDIR =	$(ELFLIBDIR64)
-CONVLIBDIR =	$(CONVLIBDIR64)
-
-ROOTPROG = $(ROOTPROG64)
-ROOTCCSBINLINK = $(ROOTCCSBINLINK64)
-
 include		../Makefile.targ
 include		$(SRC)/Makefile.master.64
 
-install:	$(ROOTPROG64)
+install:	$(ROOTPROG) $(ROOTPROG64) \
+	$(ROOTCCSBINLINK) $(ROOTCCSBINLINK64)
+
+$(ROOTBIN64)/dump:
+	$(RM) $@; $(SYMLINK) ../../bin/dump $@
diff --git a/usr/src/pkg/manifests/developer-object-file.p5m b/usr/src/pkg/manifests/developer-object-file.p5m
index 763401d1c3..14f22cd0e5 100644
--- a/usr/src/pkg/manifests/developer-object-file.p5m
+++ b/usr/src/pkg/manifests/developer-object-file.p5m
@@ -35,7 +35,7 @@ dir  path=usr group=sys
 dir  path=usr/bin
 dir  path=usr/bin/$(ARCH64)
 file path=usr/bin/$(ARCH64)/ar mode=0555
-file path=usr/bin/$(ARCH64)/dump mode=0555
+link path=usr/bin/$(ARCH64)/dump target=../../bin/dump
 link path=usr/bin/$(ARCH64)/elfdump target=../../bin/elfdump
 file path=usr/bin/$(ARCH64)/elfedit mode=0555
 file path=usr/bin/$(ARCH64)/mcs mode=0555