summaryrefslogtreecommitdiff
path: root/usr/src/cmd/sgs
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/sgs')
-rw-r--r--usr/src/cmd/sgs/dump/Makefile5
-rw-r--r--usr/src/cmd/sgs/dump/Makefile.com6
-rw-r--r--usr/src/cmd/sgs/dump/amd64/Makefile13
-rw-r--r--usr/src/cmd/sgs/dump/common/dump.c5
-rw-r--r--usr/src/cmd/sgs/dump/i386/Makefile33
-rw-r--r--usr/src/cmd/sgs/dump/sparc/Makefile33
-rw-r--r--usr/src/cmd/sgs/dump/sparcv9/Makefile13
-rw-r--r--usr/src/cmd/sgs/elfdump/Makefile4
-rw-r--r--usr/src/cmd/sgs/elfdump/Makefile.com9
-rw-r--r--usr/src/cmd/sgs/elfdump/amd64/Makefile13
-rw-r--r--usr/src/cmd/sgs/elfdump/common/main.c8
-rw-r--r--usr/src/cmd/sgs/elfdump/i386/Makefile35
-rw-r--r--usr/src/cmd/sgs/elfdump/sparc/Makefile33
-rw-r--r--usr/src/cmd/sgs/elfdump/sparcv9/Makefile12
14 files changed, 30 insertions, 192 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/cmd/sgs/elfdump/Makefile b/usr/src/cmd/sgs/elfdump/Makefile
index 2f70df00c7..35c78efe07 100644
--- a/usr/src/cmd/sgs/elfdump/Makefile
+++ b/usr/src/cmd/sgs/elfdump/Makefile
@@ -23,7 +23,7 @@
# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
+
+BUILD32 = $(POUND_SIGN)
include $(SRC)/cmd/sgs/Makefile.sub
diff --git a/usr/src/cmd/sgs/elfdump/Makefile.com b/usr/src/cmd/sgs/elfdump/Makefile.com
index c5190adcd4..1caec6d1bf 100644
--- a/usr/src/cmd/sgs/elfdump/Makefile.com
+++ b/usr/src/cmd/sgs/elfdump/Makefile.com
@@ -51,11 +51,10 @@ MAPOPT= $(MAPFILE:%=-Wl,-M%)
CPPFLAGS= -I. -I../common -I../../include -I../../include/$(MACH) \
-I$(SRC)/lib/libc/inc -I$(SRC)/uts/$(ARCH)/sys \
$(CPPFLAGS.master) -I$(ELFCAP)
-LLDFLAGS = '-R$$ORIGIN/../../lib'
-LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)'
-LDFLAGS += $(VERSREF) $(MAPOPT) $(LLDFLAGS)
-LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \
- $(CONVLIBDIR) -lconv
+
+LDFLAGS += $(VERSREF) $(MAPOPT) '-R$$ORIGIN/../../lib/$(MACH64)'
+LDLIBS += $(ELFLIBDIR64) -lelf $(LDDBGLIBDIR64) -llddbg \
+ $(CONVLIBDIR64) -lconv
NATIVE_LDFLAGS = $(LDASSERTS) $(BDIRECT)
diff --git a/usr/src/cmd/sgs/elfdump/amd64/Makefile b/usr/src/cmd/sgs/elfdump/amd64/Makefile
index b04872649b..0294565bb4 100644
--- a/usr/src/cmd/sgs/elfdump/amd64/Makefile
+++ b/usr/src/cmd/sgs/elfdump/amd64/Makefile
@@ -31,17 +31,14 @@ include ../Makefile.com
.KEEP_STATE:
ARCH = amd64
-LLDFLAGS = $(LLDFLAGS64)
-ELFLIBDIR = $(ELFLIBDIR64)
-LDDBGLIBDIR = $(LDDBGLIBDIR64)
-CONVLIBDIR = $(CONVLIBDIR64)
-
-ROOTPROG = $(ROOTPROG64)
-ROOTCCSBINLINK = $(ROOTCCSBINLINK64)
install: all $(ROOTPROG64)
include ../Makefile.targ
include $(SRC)/Makefile.master.64
-install: $(ROOTPROG64)
+install: $(ROOTPROG) $(ROOTPROG64) \
+ $(ROOTCCSBINLINK) $(ROOTCCSBINLINK64)
+
+$(ROOTBIN64)/elfdump:
+ $(RM) $@; $(SYMLINK) ../../bin/elfdump $@
diff --git a/usr/src/cmd/sgs/elfdump/common/main.c b/usr/src/cmd/sgs/elfdump/common/main.c
index ed95ad5892..7acecdaf96 100644
--- a/usr/src/cmd/sgs/elfdump/common/main.c
+++ b/usr/src/cmd/sgs/elfdump/common/main.c
@@ -174,7 +174,7 @@ detail_usage()
*/
void
dump_hex_bytes(const void *data, size_t n, int indent,
- int bytes_per_col, int col_per_row)
+ int bytes_per_col, int col_per_row)
{
const uchar_t *ldata = data;
int bytes_per_row = bytes_per_col * col_per_row;
@@ -735,12 +735,6 @@ main(int argc, char **argv, char **envp)
uchar_t osabi = ELFOSABI_NONE;
/*
- * If we're on a 64-bit kernel, try to exec a full 64-bit version of
- * the binary. If successful, conv_check_native() won't return.
- */
- (void) conv_check_native(argv, envp);
-
- /*
* Establish locale.
*/
(void) setlocale(LC_MESSAGES, MSG_ORIG(MSG_STR_EMPTY));
diff --git a/usr/src/cmd/sgs/elfdump/i386/Makefile b/usr/src/cmd/sgs/elfdump/i386/Makefile
deleted file mode 100644
index 95390a2899..0000000000
--- a/usr/src/cmd/sgs/elfdump/i386/Makefile
+++ /dev/null
@@ -1,35 +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.
-#
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-ARCH = i386
-
-install: all $(ROOTPROG32)
-
-include ../Makefile.targ
diff --git a/usr/src/cmd/sgs/elfdump/sparc/Makefile b/usr/src/cmd/sgs/elfdump/sparc/Makefile
deleted file mode 100644
index a2c6327b0b..0000000000
--- a/usr/src/cmd/sgs/elfdump/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.
-#
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-ARCH = sparc
-
-include ../Makefile.targ
diff --git a/usr/src/cmd/sgs/elfdump/sparcv9/Makefile b/usr/src/cmd/sgs/elfdump/sparcv9/Makefile
index f24ce47957..2db168be93 100644
--- a/usr/src/cmd/sgs/elfdump/sparcv9/Makefile
+++ b/usr/src/cmd/sgs/elfdump/sparcv9/Makefile
@@ -31,16 +31,12 @@ include ../Makefile.com
.KEEP_STATE:
ARCH = sparcv9
-LLDFLAGS = $(LLDFLAGS64)
-ELFLIBDIR = $(ELFLIBDIR64)
-LDDBGLIBDIR = $(LDDBGLIBDIR64)
-CONVLIBDIR = $(CONVLIBDIR64)
-
-ROOTPROG = $(ROOTPROG64)
-ROOTCCSBINLINK = $(ROOTCCSBINLINK64)
include ../Makefile.targ
include $(SRC)/Makefile.master.64
-install: $(ROOTPROG64)
+install: $(ROOTPROG) $(ROOTPROG64) \
+ $(ROOTCCSBINLINK) $(ROOTCCSBINLINK64)
+$(ROOTBIN64)/elfdump:
+ $(RM) $@; $(SYMLINK) ../../bin/elfdump $@
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 18:45:12 +0000