5072038 binaries shouldn't be stripped

31 files changed, 38 insertions, 197 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index b79d8e2e3f..0514eb6424 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -55,9 +55,6 @@ ROOT=		/proto
 # STRIP_COMMENTS toggles comment section striping. Generally the same setting
 # as INTERNAL_RELEASE_BUILD.
 #
-# STRIPFLAG is similar.  It is set here for use in lower level Makefiles to
-# allow a single point change to affect the entire build.
-#
 # __GNUC toggles the building of ON components using gcc and related tools.
 # Normally set to `#', set it to `' to do gcc build.
 #
@@ -88,20 +85,6 @@ INTEL_BLD=      $(INTEL_BLD_1:i386=)
 
 STRIP_COMMENTS=	$(INTERNAL_RELEASE_BUILD)
 
-# Historical notes: at one point, STRIPFLAG was set to '-s' for root builds,
-# and empty for non-root.  It's now set empty all the time, so that builds
-# using manual invocation of "make install" will have debug data (as they did
-# when run as non-root before).  The 'nightly' script overrides DEF_STRIPFLAG
-# with '-s' so that nightly builds are stripped -- since nightlies were once
-# done only as root, that preserves the known nightly behavior.  The
-# non-nightly behavior can always be overridden by putting "STRIPFLAG=" in the
-# environment, on the 'make' command line, or by overriding STRIPFLAG in the
-# subsystem Makefile itself.  STRIP_COMMENTS, although similar in nature, has
-# always been controlled by INTERNAL_RELEASE_BUILD (always set by nightly).
-
-DEF_STRIPFLAG=
-STRIPFLAG=$(DEF_STRIPFLAG)
-
 # set __GNUC= in the environment to build 32-bit with the gcc compiler.
 # The default is to use the Sun Studio 10 compiler for all processor types.
 __GNUC=		$(POUND_SIGN)
@@ -784,7 +767,8 @@ POST_PROCESS_O=		$(PROCESS_COMMENT) $@
 POST_PROCESS_A=
 POST_PROCESS_SO=	$(PROCESS_COMMENT) $@ ; $(STRIP_STABS) ; \
 			$(ELFSIGN_OBJECT)
-POST_PROCESS=		$(PROCESS_COMMENT) $@ ; $(ELFSIGN_OBJECT)
+POST_PROCESS=		$(PROCESS_COMMENT) $@ ; $(STRIP_STABS) ; \
+			$(ELFSIGN_OBJECT)
 
 #
 # The PKGDEFS macro points to the source directory containing the majority
diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd
index 0ffe991336..c1845944a9 100644
--- a/usr/src/cmd/Makefile.cmd
+++ b/usr/src/cmd/Makefile.cmd
@@ -132,7 +132,7 @@ NES_MAPFILE=	$(SRC)/cmd/mapfile_noexstk $(NX_MAP)
 LDLIBS =	$(LDLIBS.cmd)
 
 LDFLAGS.cmd = \
-	$(STRIPFLAG) $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) \
+	$(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) \
 	$(NES_MAPFILE:%=-M%) $(PGA_MAPFILE:%=-M%)
 
 LDFLAGS =	$(LDFLAGS.cmd)
diff --git a/usr/src/cmd/cpc/cpustat/Makefile b/usr/src/cmd/cpc/cpustat/Makefile
index 155e5b9e50..097b3b0c3b 100644
--- a/usr/src/cmd/cpc/cpustat/Makefile
+++ b/usr/src/cmd/cpc/cpustat/Makefile
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,12 +36,6 @@ CFLAGS		+= $(CCVERBOSE) $(CTF_FLAGS)
 CPPFLAGS	+= -D_REENTRANT -I$(SRC)/lib/libcpc/common
 LDLIBS +=	-lcpc -lposix4 -lkstat
 
-#
-# CPC commands include CTF data so they must not be stripped with '-s'. This
-# overrides the "-s" switch in the default link flags.
-#
-STRIPFLAG=
-
 .KEEP_STATE:
 
 all:	$(PROG)
diff --git a/usr/src/cmd/cpc/cputrack/Makefile.com b/usr/src/cmd/cpc/cputrack/Makefile.com
index beab421a75..a6b61171f1 100644
--- a/usr/src/cmd/cpc/cputrack/Makefile.com
+++ b/usr/src/cmd/cpc/cputrack/Makefile.com
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -40,12 +40,6 @@ CPPFLAGS +=	-I$(SRC)/lib/libcpc/common
 LINTFLAGS +=	-u
 LINTFLAGS64 +=	-u
 
-#
-# CPC commands include CTF data so they must not be stripped with '-s'. This
-# overrides the "-s" switch in the default link flags.
-#
-STRIPFLAG=
-
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/dtrace/Makefile.com b/usr/src/cmd/dtrace/Makefile.com
index bd0094ac4b..7c275fee27 100644
--- a/usr/src/cmd/dtrace/Makefile.com
+++ b/usr/src/cmd/dtrace/Makefile.com
@@ -36,7 +36,6 @@ CFLAGS += $(CCVERBOSE)
 CFLAGS64 += $(CCVERBOSE)
 LDLIBS += -ldtrace -lproc -lctf
 
-STRIPFLAG =
 FILEMODE = 0555
 GROUP = bin
 
diff --git a/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com b/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com
index 7cbbd905f4..c4a018513d 100644
--- a/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com
+++ b/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,11 +32,6 @@ LOCALOBJS = eftinfo.o
 OBJS = $(LOCALOBJS) $(COMMONOBJS)
 SRCS = $(LOCALOBJS:.o=.c) $(COMMONSRCS)
 
-#
-# Reset STRIPFLAG to the empty string.  rdasim is intentionally
-# installed with symbol tables to aid debugging.
-#
-STRIPFLAG=
 CPPFLAGS += -I../common
 CFLAGS += $(CTF_FLAGS)
 LDLIBS += -lumem
diff --git a/usr/src/cmd/fm/eversholt/esc/Makefile.com b/usr/src/cmd/fm/eversholt/esc/Makefile.com
index f71eb4b528..8c282040b6 100644
--- a/usr/src/cmd/fm/eversholt/esc/Makefile.com
+++ b/usr/src/cmd/fm/eversholt/esc/Makefile.com
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,11 +36,6 @@ LOCALOBJS = escmain.o
 OBJS = $(LOCALOBJS) $(COMMONOBJS)
 SRCS = $(LOCALOBJS:.o=.c) $(COMMONSRCS)
 
-#
-# Reset STRIPFLAG to the empty string.  esc is intentionally
-# installed with symbol tables to aid compiler debugging.
-#
-STRIPFLAG=
 CPPFLAGS += -I../common
 CFLAGS += -DESC $(CTF_FLAGS)
 LDLIBS += -lumem
diff --git a/usr/src/cmd/fm/fmadm/Makefile.com b/usr/src/cmd/fm/fmadm/Makefile.com
index c12510d302..6f8fa62840 100644
--- a/usr/src/cmd/fm/fmadm/Makefile.com
+++ b/usr/src/cmd/fm/fmadm/Makefile.com
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -47,7 +47,6 @@ CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST)
 LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_adm
 LDFLAGS += -R/usr/lib/fm
 LINTFLAGS += -mnu
-STRIPFLAG =
 
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)
diff --git a/usr/src/cmd/fm/fmd/Makefile.fmd b/usr/src/cmd/fm/fmd/Makefile.fmd
index 59b91b93d9..649d1050e2 100644
--- a/usr/src/cmd/fm/fmd/Makefile.fmd
+++ b/usr/src/cmd/fm/fmd/Makefile.fmd
@@ -131,12 +131,6 @@ fmd_svc_adm.ln fmd_svc_api.ln fmd_xdr_adm.ln fmd_xdr_api.ln := LINTFLAGS += \
 
 lint_prog := LINTFLAGS += -xerroff=E_FUNC_RET_ALWAYS_IGNOR2
 
-#
-# Reset STRIPFLAG to the empty string.  FMD is intentionally installed with
-# a symbol table in order to help agent and diagnosis engine developers.
-#
-STRIPFLAG =
-
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)
 
diff --git a/usr/src/cmd/fm/fmdump/Makefile.com b/usr/src/cmd/fm/fmdump/Makefile.com
index b90437fe7d..f092c87d04 100644
--- a/usr/src/cmd/fm/fmdump/Makefile.com
+++ b/usr/src/cmd/fm/fmdump/Makefile.com
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -41,7 +41,6 @@ CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST)
 LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_log -lnvpair
 LDFLAGS += -R/usr/lib/fm
 LINTFLAGS += -mnu
-STRIPFLAG =
 
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)
diff --git a/usr/src/cmd/fm/fmstat/Makefile.com b/usr/src/cmd/fm/fmstat/Makefile.com
index 98606a3049..5413b919f1 100644
--- a/usr/src/cmd/fm/fmstat/Makefile.com
+++ b/usr/src/cmd/fm/fmstat/Makefile.com
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -42,7 +42,6 @@ CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST)
 LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_adm
 LDFLAGS += -R/usr/lib/fm
 LINTFLAGS += -mnu
-STRIPFLAG =
 
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)
diff --git a/usr/src/cmd/fm/modules/Makefile.plugin b/usr/src/cmd/fm/modules/Makefile.plugin
index ce422ebb8d..78a19027c5 100644
--- a/usr/src/cmd/fm/modules/Makefile.plugin
+++ b/usr/src/cmd/fm/modules/Makefile.plugin
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -66,12 +66,6 @@ CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZDEFS) $(ZIGNORE) -M$(APIMAP)
 LDLIBS += -lnvpair -lrt -lc
 
-#
-# Reset STRIPFLAG to the empty string.  FMA modules are intentionally installed
-# with symbol tables in order to help module developers.
-#
-STRIPFLAG =
-
 all: $(PROG)
 
 .NO_PARALLEL:
diff --git a/usr/src/cmd/fm/schemes/Makefile.com b/usr/src/cmd/fm/schemes/Makefile.com
index c782dd057f..e210755d5b 100644
--- a/usr/src/cmd/fm/schemes/Makefile.com
+++ b/usr/src/cmd/fm/schemes/Makefile.com
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -51,9 +51,3 @@ CFLAGS += -G $(XREGSFLAG)
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -I.
 LDFLAGS += $(ZTEXT) $(ZCOMBRELOC) $(ZDEFS) $(ZIGNORE) -M$(MAPFILE)
 LDLIBS += -lnvpair -lc
-
-#
-# Reset STRIPFLAG to the empty string.  FMA modules are intentionally installed
-# with symbol tables in order to help module developers.
-#
-STRIPFLAG =
diff --git a/usr/src/cmd/fm/topo/plugins/Makefile.plugin b/usr/src/cmd/fm/topo/plugins/Makefile.plugin
index eed41b53c2..c0db88713a 100644
--- a/usr/src/cmd/fm/topo/plugins/Makefile.plugin
+++ b/usr/src/cmd/fm/topo/plugins/Makefile.plugin
@@ -58,12 +58,6 @@ CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 LDFLAGS += -z text -z combreloc -z defs -z ignore -R/usr/lib/fm
 LDLIBS += -L$(ROOTLIB)/fm -ltopo -lc
 
-#
-# Reset STRIPFLAG to the empty string.  FMA modules are intentionally installed
-# with symbol tables in order to help module developers.
-#
-STRIPFLAG =
-
 all: $(PROG)
 
 .NO_PARALLEL:
diff --git a/usr/src/cmd/fm/topo/prtopo/Makefile.com b/usr/src/cmd/fm/topo/prtopo/Makefile.com
index d27c601172..e36f587e51 100644
--- a/usr/src/cmd/fm/topo/prtopo/Makefile.com
+++ b/usr/src/cmd/fm/topo/prtopo/Makefile.com
@@ -34,11 +34,6 @@ SRCS = $(OBJS:.o=.c)
 LINTSRCS = $(OBJS:%.o=../common/%.c)
 LINTFLAGS = -mnux
 
-#
-# Reset STRIPFLAG to the empty string.  esc is intentionally
-# installed with symbol tables to aid compiler debugging.
-#
-STRIPFLAG=
 CPPFLAGS += -I../common
 CFLAGS += $(CTF_FLAGS)
 
diff --git a/usr/src/cmd/fs.d/hsfs/ident/Makefile b/usr/src/cmd/fs.d/hsfs/ident/Makefile
index 5fd396abb9..075343c167 100644
--- a/usr/src/cmd/fs.d/hsfs/ident/Makefile
+++ b/usr/src/cmd/fs.d/hsfs/ident/Makefile
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Makefile for HSFS ident function.
@@ -48,7 +48,6 @@ include ../../Makefile.fstype
 
 SRCS=	${LIBPROG:%.so.$(IDENT_VERS)=%.c}
 
-STRIPFLAG =
 CPPFLAGS += 	-DIDENT_VERS=${IDENT_VERS}
 LDFLAGS +=	$(ZTEXT) $(ZDEFS) $(ZCOMBRELOC)
 LIBS=		-lc
diff --git a/usr/src/cmd/intrstat/Makefile.com b/usr/src/cmd/intrstat/Makefile.com
index 7ab55db930..7bec33d71d 100644
--- a/usr/src/cmd/intrstat/Makefile.com
+++ b/usr/src/cmd/intrstat/Makefile.com
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,7 +36,6 @@ CFLAGS += $(CCVERBOSE)
 CFLAGS64 += $(CCVERBOSE)
 LDLIBS += -ldtrace -lrt
 
-STRIPFLAG =
 FILEMODE = 0555
 GROUP = bin
 
diff --git a/usr/src/cmd/mdb/Makefile.kmdb b/usr/src/cmd/mdb/Makefile.kmdb
index 6827edde54..49264693e5 100644
--- a/usr/src/cmd/mdb/Makefile.kmdb
+++ b/usr/src/cmd/mdb/Makefile.kmdb
@@ -83,12 +83,6 @@ SUPPORTED_TERMS	= \
 	xterm \
 	xterms
 
-#
-# Reset STRIPFLAG to the empty string.  MDB is intentionally installed
-# with a symbol table in order to help module developers.
-#
-STRIPFLAG =
-
 LINTFLAGS += -n -errtags=yes
 
 # The prom interfaces (the prom_* files) are compiled with -D_KERNEL, which
diff --git a/usr/src/cmd/mdb/Makefile.libstand b/usr/src/cmd/mdb/Makefile.libstand
index 6f0e665550..d260ff4680 100644
--- a/usr/src/cmd/mdb/Makefile.libstand
+++ b/usr/src/cmd/mdb/Makefile.libstand
@@ -69,12 +69,6 @@ CFLAGS64 += $(STAND_FLAGS_64)
 
 ASFLAGS += -P -D_ASM
 
-#
-# Reset STRIPFLAG to the empty string.  MDB is intentionally installed
-# with a symbol table in order to help module developers.
-#
-STRIPFLAG =
-
 LINTFLAGS += -n -errtags=yes
 CLINTFILES = $(SRCS:%.c=%.ln)
 LINTFILES = $(CLINTFILES:%.s=%.ln)
diff --git a/usr/src/cmd/mdb/Makefile.mdb b/usr/src/cmd/mdb/Makefile.mdb
index ded9ed8843..659ae17803 100644
--- a/usr/src/cmd/mdb/Makefile.mdb
+++ b/usr/src/cmd/mdb/Makefile.mdb
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -88,12 +88,6 @@ CPPFLAGS += -D_MDB -I. -I../.. -I../../../common
 LDLIBS += -ltermcap -lkvm -lproc -lrtld_db -lctf -lumem \
 	$(ZLAZYLOAD) -lscf $(ZNOLAZYLOAD)
 
-#
-# Reset STRIPFLAG to the empty string.  MDB is intentionally installed
-# with a symbol table in order to help module developers.
-#
-STRIPFLAG =
-
 LINTFLAGS += -n -errtags=yes
 LINTFILES = $(SRCS:%.c=%.ln)
 
diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module
index ae107750e2..345345b8e4 100644
--- a/usr/src/cmd/mdb/Makefile.module
+++ b/usr/src/cmd/mdb/Makefile.module
@@ -132,11 +132,6 @@ $(KMODOBJS) := CFLAGS64 += $(STAND_FLAGS_64)
 #
 MODSRCS_DIR = ../../../common/modules/genunix
 
-#
-# Reset STRIPFLAG to the empty string.  MDB modules are intentionally installed
-# with symbol tables in order to help module developers.
-#
-STRIPFLAG =
 GROUP = sys
 
 all: $$(TARGETS)
diff --git a/usr/src/cmd/svc/Makefile.ctf b/usr/src/cmd/svc/Makefile.ctf
index f44a38389a..2c4c1fa3fc 100644
--- a/usr/src/cmd/svc/Makefile.ctf
+++ b/usr/src/cmd/svc/Makefile.ctf
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -31,5 +31,3 @@ CTFCONVERT_HOOK = && $(CTFCONVERT_O)
 CFLAGS += $(CTF_FLAGS)
 CFLAGS64 += $(CTF_FLAGS)
 NATIVE_CFLAGS += $(CTF_FLAGS)
-STRIPFLAG =				# CTF requires the symbol table
-
diff --git a/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/Makefile b/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/Makefile
index 7d43a20992..5c90dcea2a 100644
--- a/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/Makefile
+++ b/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/Makefile
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -110,8 +110,6 @@ CFLAGS		+= $(XREGSFLAG) $(C_PICFLAGS)
 LINTFLAGS	+= -um
 LINTLIBS	= $(LDLIBS.cmd)
 
-STRIPFLAG	=
-
 LDFLAGS		+= -Mmapfile $(GSHARED) -R/usr/sadm/lib/wbem \
 		    $(ZCOMBRELOC) $(ZTEXT) $(ZDEFS) $(SOFLAGS)
 
diff --git a/usr/src/cmd/wbem/provider/c/wbem_disk/lib/Makefile b/usr/src/cmd/wbem/provider/c/wbem_disk/lib/Makefile
index e23cc4840c..1ceb839a07 100644
--- a/usr/src/cmd/wbem/provider/c/wbem_disk/lib/Makefile
+++ b/usr/src/cmd/wbem/provider/c/wbem_disk/lib/Makefile
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -123,8 +123,6 @@ CFLAGS		+= $(XREGSFLAG) $(C_PICFLAGS)
 LINTFLAGS	+= -um
 LINTLIBS	= $(LDLIBS.cmd)
 
-STRIPFLAG	=
-
 LDFLAGS		+= -Mmapfile $(GSHARED) -R/usr/sadm/lib/wbem \
 		    $(ZCOMBRELOC) $(ZTEXT) $(ZDEFS) $(SOFLAGS)
 
diff --git a/usr/src/tools/Makefile.tools b/usr/src/tools/Makefile.tools
index 436fa5055d..9652b0455d 100644
--- a/usr/src/tools/Makefile.tools
+++ b/usr/src/tools/Makefile.tools
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -52,7 +52,7 @@ NES_MAPFILE=		$(SRC)/cmd/mapfile_noexstk $(NX_MAP)
 CPPFLAGS=		-D_TS_ERRNO
 ELFSIGN_O=		$(TRUE)
 LDLIBS=
-LDFLAGS=		$(STRIPFLAG) $(NES_MAPFILE:%=-M%)
+LDFLAGS=		$(NES_MAPFILE:%=-M%)
 
 ROOTONBLDPROG=		$(PROG:%=$(ROOTONBLDBIN)/%)
 ROOTONBLDMACHPROG=	$(PROG:%=$(ROOTONBLDBINMACH)/%)
diff --git a/usr/src/tools/ctf/cvt/Makefile.com b/usr/src/tools/ctf/cvt/Makefile.com
index 3e6610f4d5..323df50520 100644
--- a/usr/src/tools/ctf/cvt/Makefile.com
+++ b/usr/src/tools/ctf/cvt/Makefile.com
@@ -20,15 +20,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 
 include ../../Makefile.ctf
 
-STRIPFLAG=
-
 .KEEP_STATE:
 .PARALLEL:
 
diff --git a/usr/src/tools/cw/Makefile b/usr/src/tools/cw/Makefile
index 07a832f3f9..0363f8fbe9 100644
--- a/usr/src/tools/cw/Makefile
+++ b/usr/src/tools/cw/Makefile
@@ -44,7 +44,7 @@ $(__GNUC)CFLAGS=	-O -D__sun -Wall -Wno-unknown-pragmas -Werror \
 			-std=gnu89 -nodefaultlibs
 
 $(__GNUC)LDLIBS +=	-lc
-$(__GNUC)LDFLAGS= 	$(STRIPFLAG) $(NES_MAPFILE:%=-Wl,-M%)
+$(__GNUC)LDFLAGS= 	$(NES_MAPFILE:%=-Wl,-M%)
 
 CPPFLAGS += -DDEFAULT_CC_DIR='"$(SPRO_VROOT)/bin"'
 CPPFLAGS += -DDEFAULT_GCC_DIR='"$(GNU_ROOT)/bin"'
diff --git a/usr/src/tools/scripts/check_rtime.1 b/usr/src/tools/scripts/check_rtime.1
index a2b05729da..8020ce44d3 100644
--- a/usr/src/tools/scripts/check_rtime.1
+++ b/usr/src/tools/scripts/check_rtime.1
@@ -22,7 +22,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH check_rtime 1 "8 May 2001"
+.TH check_rtime 1 "30 Aug 2005"
 .SH NAME
 .I check_rtime
 \- check ELF runtime attributes
@@ -37,8 +37,8 @@ attempts to check a number of ELF runtime attributes
 for consistency with common build rules.
 These checks involve running \fBldd(1)\fP and
 \fBelfdump(1)\fP against a family of dynamic objects.
-Dynamic objects can be defined explicitly as a \fIfile\fP
-or will be located under the directory \fIdir\fP.
+A dynamic object can be defined explicitly as a \fIfile\fP
+or multiple dynamic objects can be located under the directory \fIdir\fP.
 .LP
 .I check_rtime
 is typically called from \fBnightly(1)\fP when the \fB-r\fP
@@ -182,41 +182,24 @@ information.  Note, removal of debugging information is only enabled
 for release builds. The existence of debugging information is displayed as:
 .sp
 .RS 6
-foo: debugging sections should be deleted \\
-.br
-	<no -s or strip -x?>
+foo: debugging sections should be deleted  <no strip -x?>
 .RE
 .TP
 \(bu
-Shared objects should retain their full \fI.symtab\fP symbol table.
+All objects should retain their full \fI.symtab\fP symbol table.
 Although this consumes disk space, it provides for more extensive stack
 tracing when debugging user applications.
-Any shared object a user application may use,
-which includes private shared objects that provide the implementation
-backend to public shared objects, should retain their symbol table.
 .sp
-Hard coding a \fI-s\fP flag with \fB$(DYNFLAGS)\fP is the typical
+Hard coding a \fI-s\fP flag with \fB$(LDFLAGS)\fP or
+\fB$(DYNFLAGS)\fP is the typical
 reason for symbol tables being removed.
-Shared objects that do not contain a symbol table are displayed as:
+Objects that do not contain a symbol table are displayed as:
 .sp
 .RS 6
 foo.so.1: symbol table should not be stripped  <remove -s?>
 .RE
 .TP
 \(bu
-Dynamic executables should not retain their full \fI.symtab\fP symbol table.
-Doing so requires too much disk space, and provides little value.
-.sp
-Not inheriting the correct \fB$(LDFLAGS)\fP from \fIcmd/Makefile.cmd\fP
-is the typical reason for not removing full symbol tables.  Note, removal
-of full symbol tables is only enabled for release builds.
-Dynamic executables that contain a symbol table are displayed as:
-.sp
-.RS 6
-foo: symbol table should be stripped  <-s?>
-.RE
-.TP
-\(bu
 Applications should have a non-executable stack defined to make
 them less vulnerable to buffer overflow attacks.
 .sp
@@ -332,8 +315,7 @@ by the objects name.  This output style is more terse, but is
 more appropriate for sorting and diffing with previous build results.
 .TP
 .B \-s
-Determine whether \fI.stabs\fP sections and/or \fI.symtab\fP
-symbol tables exist.
+Determine whether \fI.stabs\fP sections exist.
 .LP
 .SH ALTERNATIVE DEPENDENCY MAPPING
 As
diff --git a/usr/src/tools/scripts/check_rtime.pl b/usr/src/tools/scripts/check_rtime.pl
index 7e5bf65745..7f2df0db4b 100644
--- a/usr/src/tools/scripts/check_rtime.pl
+++ b/usr/src/tools/scripts/check_rtime.pl
@@ -59,7 +59,7 @@
 # Define all global variables (required for strict)
 use vars  qw($SkipDirs $SkipFiles $SkipTextrelFiles);
 use vars  qw($SkipUndefDirs $SkipUndefFiles $SkipUnusedDirs $SkipUnusedFiles);
-use vars  qw($SkipStripDirs $SkipNoStripFiles $SkipStabFiles $SkipNoExStkFiles);
+use vars  qw($SkipStabFiles $SkipNoExStkFiles);
 use vars  qw($UnusedNoise $Prog $Mach $Isalist $Env $Ena64 $Tmpdir $Error);
 use vars  qw($UnusedFiles $UnusedPaths $LddNoU $Crle32 $Crle64 $Conf32 $Conf64);
 use vars  qw($SkipInterps $OldDeps %opt);
@@ -166,19 +166,6 @@ $SkipUnusedFiles = qr{ ^(?:
 	)$
 }x;
 
-# Define any files that can be stripped.
-$SkipStripDirs = qr{
-	/abi/
-}x;
-
-# Define any files that must not be stripped.
-$SkipNoStripFiles = qr{ ^(?:
-	adb |
-	mdb |
-	unix
-	)$
-}x;
-
 # Define any files that should contain debugging information.
 $SkipStabFiles = qr{ ^(?:
 	abi_.* |
@@ -847,36 +834,17 @@ ELF:	foreach my $Line (@Elf) {
 			}
 		}
 		OutMsg($Ttl++, $RelPath,
-		    "\tdebugging sections should be deleted\t<no -s or strip -x?>");
+		    "\tdebugging sections should be deleted\t<no strip -x?>");
 	}
 
 DONESTAB:
 
-	# Shared objects should have a full symbol table to provide complete
+	# All objects should have a full symbol table to provide complete
 	# debugging stack traces.
-	if ($opt{s} && $Dll && $Strip) {
-		if (!$opt{a}) {
-			if ($RelPath =~ $SkipStripDirs) {
-				goto DONESTRIP;
-			}
-		}
+	if ($Strip) {
 		OutMsg($Ttl++, $RelPath,
 		    "\tsymbol table should not be stripped\t<remove -s?>");
 	}
-
-	# No other dynamic object should have a .symtab symbol table.
-	if ($opt{s} && ($Dll == 0) && ($Strip == 0)) {
-		if (!$opt{a}) {
-			if ($File =~ $SkipNoStripFiles) {
-				goto DONESTRIP;
-			}
-		}
-		OutMsg($Ttl++, $RelPath,
-		    "\tsymbol table should be stripped\t<no -s?>");
-	}
-
-DONESTRIP:
-
 }
 
 
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh
index ab4c43abad..115f7c9252 100644
--- a/usr/src/tools/scripts/nightly.sh
+++ b/usr/src/tools/scripts/nightly.sh
@@ -1158,13 +1158,10 @@ else
 	PROTOCMPTERSE="protocmp.terse -gu"
 fi
 POUND_SIGN="#"
-DEF_STRIPFLAG="-s"
 
 # we export POUND_SIGN to speed up the build process -- prevents evaluation of
 # the Makefile.master definitions.
-# we export DEF_STRIPFLAG to strip debug data from nightly builds; the default
-# behavior is to include all debug data.
-export o_FLAG POUND_SIGN DEF_STRIPFLAG
+export o_FLAG POUND_SIGN
 
 if [ "$d_FLAG" = "y" ]; then
 	maketype="distributed"
diff --git a/usr/src/ucbcmd/Makefile.ucbcmd b/usr/src/ucbcmd/Makefile.ucbcmd
index 02ba1fa476..641333b644 100644
--- a/usr/src/ucbcmd/Makefile.ucbcmd
+++ b/usr/src/ucbcmd/Makefile.ucbcmd
@@ -40,8 +40,6 @@ CHMOD=		chmod
 MKDIR=		mkdir
 TOUCH=		touch
 
-LDFLAGS +=	$(STRIPFLAG)
-
 FILEMODE=	0555
 LIBFILEMODE=	0444
 ROOTBIN=	$(ROOT)/usr/ucb
@@ -71,11 +69,11 @@ LDLIBS.cmd =    $(ENVLDLIBS1)  $(ENVLDLIBS2)  $(ENVLDLIBS3)
 LDLIBS =        $(LDLIBS.cmd)
 
 LDFLAGS.cmd = \
-	$(STRIPFLAG) $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) \
+	$(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) \
 	$(NES_MAPFILE:%=-M%) \
 	$(PGA_MAPFILE:%=-M%)
 
-LDFLAGS =       $(STRIPFLAG) $(LDFLAGS.cmd)
+LDFLAGS =       $(LDFLAGS.cmd)
 
 SETRUNPATH=	LD_RUN_PATH=/usr/ucblib