10051 cw(1) shouldn't have to translate -g

Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>

35 files changed, 80 insertions, 143 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index fc8d94f2e7..5b6cd53942 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -501,17 +501,22 @@ CGLOBALSTATIC= -W0,-xglobalstatic
 CALLSYMS=	-W0,-xdbggen=no%usedonly
 
 #
-# Default debug format for Sun Studio 11 is dwarf, so force it to
-# generate stabs.
+# We force the compilers to generate the debugging information best understood
+# by the CTF tools.  With Sun Studio this is stabs due to bugs in the Studio
+# compilers.  With GCC this is DWARF v2.
 #
-DEBUGFORMAT=	-xdebugformat=stabs
+DEBUGFORMAT=	-_cc=-xdebugformat=stabs -_gcc=-gdwarf-2
 
 #
-# Flags used to build in debug mode for ctf generation.  Bugs in the Devpro
-# compilers currently prevent us from building with cc-emitted DWARF.
+# Ask the compiler to include debugging information
 #
-CTF_FLAGS_sparc	= -g -Wc,-Qiselect-T1 $(CSTD) $(CNOGLOBAL) $(CDWARFSTR)
-CTF_FLAGS_i386	= -g $(CSTD) $(CNOGLOBAL) $(CDWARFSTR)
+CCGDEBUG= -g $(DEBUGFORMAT)
+
+#
+# Flags used to build in debug mode for ctf generation.
+#
+CTF_FLAGS_sparc	= $(CCGDEBUG) -Wc,-Qiselect-T1 $(CSTD) $(CNOGLOBAL)
+CTF_FLAGS_i386	= $(CCGDEBUG) $(CSTD) $(CNOGLOBAL)
 
 CTF_FLAGS_sparcv9	= $(CTF_FLAGS_sparc)
 CTF_FLAGS_amd64		= $(CTF_FLAGS_i386)
@@ -519,20 +524,22 @@ CTF_FLAGS_amd64		= $(CTF_FLAGS_i386)
 # Sun Studio produces broken userland code when saving arguments.
 $(__GNUC)CTF_FLAGS_amd64 += $(SAVEARGS)
 
-CTF_FLAGS_32	= $(CTF_FLAGS_$(MACH)) $(DEBUGFORMAT)
-CTF_FLAGS_64	= $(CTF_FLAGS_$(MACH64)) $(DEBUGFORMAT)
+CTF_FLAGS_32	= $(CTF_FLAGS_$(MACH))
+CTF_FLAGS_64	= $(CTF_FLAGS_$(MACH64))
 CTF_FLAGS	= $(CTF_FLAGS_32)
 
 #
 # Flags used with genoffsets
 #
-GOFLAGS = $(CALLSYMS) $(CDWARFSTR)
+GENOFFSETS_FLAGS = $(CALLSYMS)
 
 OFFSETS_CREATE = $(GENOFFSETS) -s $(CTFSTABS) -r $(CTFCONVERT) \
-	$(CW) --noecho $(CW_CC_COMPILERS) -- $(GOFLAGS) $(CFLAGS) $(CPPFLAGS)
+	$(CW) --noecho $(CW_CC_COMPILERS) -- $(GENOFFSETS_FLAGS) \
+	$(CFLAGS) $(CPPFLAGS)
 
 OFFSETS_CREATE64 = $(GENOFFSETS) -s $(CTFSTABS) -r $(CTFCONVERT) \
-	$(CW) --noecho $(CW_CC_COMPILERS) -- $(GOFLAGS) $(CFLAGS64) $(CPPFLAGS)
+	$(CW) --noecho $(CW_CC_COMPILERS) -- $(GENOFFSETS_FLAGS) \
+	$(CFLAGS64) $(CPPFLAGS)
 
 #
 # tradeoff time for space (smaller is better)
@@ -587,8 +594,8 @@ CCUSERFLAGS64		= $(CCUSERFLAGS)
 
 CSOURCEDEBUGFLAGS	=
 CCSOURCEDEBUGFLAGS	=
-$(SRCDBGBLD)CSOURCEDEBUGFLAGS	= -g -xs
-$(SRCDBGBLD)CCSOURCEDEBUGFLAGS	= -g -xs
+$(SRCDBGBLD)CSOURCEDEBUGFLAGS	= $(CCGDEBUG) -xs
+$(SRCDBGBLD)CCSOURCEDEBUGFLAGS	= $(CCGDEBUG) -xs
 
 CFLAGS=         $(COPTFLAG) $($(MACH)_CFLAGS) $(SPACEFLAG) $(CCMODE) \
 		$(ILDOFF) $(CERRWARN) $(CSTD) $(CCUNBOUND) $(IROPTFLAG) \
diff --git a/usr/src/cmd/backup/Makefile.targ b/usr/src/cmd/backup/Makefile.targ
index 900b0d4b66..2d6e21f5e7 100644
--- a/usr/src/cmd/backup/Makefile.targ
+++ b/usr/src/cmd/backup/Makefile.targ
@@ -19,18 +19,15 @@
 #
 # CDDL HEADER END
 #
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/backup/Makefile.targ
-#
 
 # support for debugging
 debug:=		DUMPLIB= libdump_g.a
-debug:=		CFLAGS= -g $(XESS) -DDEBUG -DFDEBUG -DTDEBUG ${SBFLAGS}
+debug:=		CFLAGS= $(CCGDEBUG) $(XESS) -DDEBUG -DFDEBUG -DTDEBUG ${SBFLAGS}
 CFLAGS +=	$(XSTRCONST)
 DEBUGDIR=	.debug
 DEBUGOBJS=	$(OBJECTS:%=$(DEBUGDIR)/%)
diff --git a/usr/src/cmd/backup/dump/Makefile b/usr/src/cmd/backup/dump/Makefile
index 997ffeaa64..965fcf8eae 100644
--- a/usr/src/cmd/backup/dump/Makefile
+++ b/usr/src/cmd/backup/dump/Makefile
@@ -88,7 +88,7 @@ FILEMODE=	04555
 
 .KEEP_STATE:
 
-all:		$(PRODUCT) 
+all:		$(PRODUCT)
 
 $(PROG):	$(OBJECTS) $$(LIBDUMP)
 	$(LINK.c) -o $@ $(OBJECTS) $(LDLIBS)
@@ -139,11 +139,6 @@ roll_log.o:
 	cp $(ROLLOBJS) .
 	pwd
 
-.debug/roll_log.o:
-	cd $(ROLLDIR) ; pwd ; $(MAKE) CFLAGS=-g
-	cp $(ROLLOBJS) .debug
-	pwd
-
 $(ROLLPOFILES): $(ROLLSRCS)
 	cd $(ROLLDIR) ; pwd ; $(MAKE) `echo $(ROLLPOFILES) | sed -e 's@$(ROLLDIR)/@@g'`
 	cp $(ROLLDIR)/*.po .
diff --git a/usr/src/cmd/backup/lib/Makefile b/usr/src/cmd/backup/lib/Makefile
index 42c882a999..0cccf936d7 100644
--- a/usr/src/cmd/backup/lib/Makefile
+++ b/usr/src/cmd/backup/lib/Makefile
@@ -77,7 +77,7 @@ GLIB=		libdump_g.a
 DEBUGS=		$(OBJECTS:%=.debug/%)
 $(GLIB):=	AROBJS = $(DEBUGS)
 $(GLIB):=	DIR = .debug
-$(GLIB):=	CFLAGS= -g $(XESS) -DDEBUG -DYYDEBUG ${SBFLAGS}
+$(GLIB):=	CFLAGS= $(CCGDEBUG) $(XESS) -DDEBUG -DYYDEBUG ${SBFLAGS}
 
 .KEEP_STATE:
 
@@ -120,4 +120,4 @@ check:	$(HDRS)
 # include library targets
 include ../../../lib/Makefile.targ
 
-_msg: 		$(POFILE)
+_msg:		$(POFILE)
diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile b/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile
index 7c552b830f..5f677b7e7c 100644
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile
@@ -44,11 +44,6 @@ CERRWARN += -_gcc=-Wno-parentheses
 
 # not linted
 SMATCH=off
-
-#
-# to compile a debug version, do a `make COPTFLAG="-g -XO0"'
-#
-
 CPPFLAGS  += -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
 LDLIBS    += -lxnet -lnvpair -ldhcpagent -ldhcputil -linetutil -ldevinfo \
 	-ldlpi -lresolv -lsocket -lipadm
diff --git a/usr/src/cmd/file/Makefile b/usr/src/cmd/file/Makefile
index 7f7da7c2d0..1446290a05 100644
--- a/usr/src/cmd/file/Makefile
+++ b/usr/src/cmd/file/Makefile
@@ -50,8 +50,8 @@ SMATCH=off
 POFILE= file_all.po
 POFILES= $(SRCS:%.c=%.po)
 
-# The debug binary can be built using the flag
-# -D COPTFLAG=-g CGLOBALSTATIC=
+# The debug binary can be built using the flags
+# SOURCEDEBUG=yes CGLOBALSTATIC=
 # This will avoid the multiple symbols definition error
 # for static global variables in elf_read32.o and elf_read64.o
 
diff --git a/usr/src/cmd/fs.d/pcfs/fsck/Makefile b/usr/src/cmd/fs.d/pcfs/fsck/Makefile
index dbe2df4a98..4be0621768 100644
--- a/usr/src/cmd/fs.d/pcfs/fsck/Makefile
+++ b/usr/src/cmd/fs.d/pcfs/fsck/Makefile
@@ -48,11 +48,6 @@ POFILE= fsck.po
 
 catalog:        $(POFILE)
 
-#
-# Uncomment the following two lines to build for dbx debugging
-#COPTFLAG = -g
-#COPTFLAG64 = -g
-#
 CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 
 CERRWARN +=	-_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/fs.d/smbclnt/mount/Makefile b/usr/src/cmd/fs.d/smbclnt/mount/Makefile
index 8f61e99026..20435bcf08 100644
--- a/usr/src/cmd/fs.d/smbclnt/mount/Makefile
+++ b/usr/src/cmd/fs.d/smbclnt/mount/Makefile
@@ -47,13 +47,7 @@ CSTD= $(CSTD_GNU99)
 
 LDLIBS += -lsmbfs
 
-CPPFLAGS += -I$(SRC)/uts/common -I$(SRC)/lib/libsmbfs 
-
-# uncomment these for dbx debugging
-#COPTFLAG = -g
-#CTF_FLAGS =
-#CTFCONVERT_O=
-#CTFMERGE_LIB=
+CPPFLAGS += -I$(SRC)/uts/common -I$(SRC)/lib/libsmbfs
 
 .KEEP_STATE:
 
@@ -67,5 +61,5 @@ install:	$(ROOTLIBFSTYPEPROG)
 
 lint:	lint_SRCS
 
-clean:     
+clean:
 	$(RM) $(OBJS) $(POFILE)
diff --git a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
index 0b1f468a2b..c6e91f33b4 100644
--- a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
+++ b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
@@ -51,12 +51,6 @@ SMATCH=off
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
-# uncomment these for dbx debugging
-#COPTFLAG = -g
-#CTF_FLAGS =
-#CTFCONVERT_O=
-#CTFMERGE_LIB=
-
 all:	$(TYPEPROG)
 
 catalog:	$(POFILE)
diff --git a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile
index 5794a07956..ae9dd15817 100644
--- a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile
+++ b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile
@@ -59,12 +59,6 @@ SMATCH=off
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
-# uncomment these for dbx debugging
-#COPTFLAG = -g
-#CTF_FLAGS =
-#CTFCONVERT_O=
-#CTFMERGE_LIB=
-
 # disable some of the less important lint
 LINTFLAGS	+= -erroff=E_FUNC_RET_ALWAYS_IGNOR2
 LINTFLAGS	+= -erroff=E_FUNC_RET_MAYBE_IGNORED2
diff --git a/usr/src/cmd/geniconvtbl/Makefile.com b/usr/src/cmd/geniconvtbl/Makefile.com
index 95049755ef..adca670979 100644
--- a/usr/src/cmd/geniconvtbl/Makefile.com
+++ b/usr/src/cmd/geniconvtbl/Makefile.com
@@ -75,14 +75,13 @@ ROOTDIRS64=	$(ROOTLIB)/iconv/$(MACH64)
 ROOTITM32 =	$(ROOTDIRS32)/$(ITM)
 ROOTITM64 =	$(ROOTDIRS64)/$(ITM)
 
-#
-# definition for some useful target like clean, 
+# defined for some useful targets like clean,
 OBJS	= $(SRCSC1:%.c=%.o) $(YTABC:.c=.o) $(LEXYY:.c=.o)
 
 CHECKHDRS = $(HDRS%.h=%.check)
 
 CLOBBERFILES=	$(ITM) $(SRCYC)
-CLEANFILES = 	$(OBJS) $(YTABC) $(YTABH) $(LEXYY) $(YOUT) \
+CLEANFILES =	$(OBJS) $(YTABC) $(YTABH) $(LEXYY) $(YOUT) \
 		$(POFILES) $(POFILE)
 
 CPPFLAGS	+= -I. -I..
@@ -92,13 +91,13 @@ CERRWARN	+= -_gcc=-Wno-switch
 CERRWARN	+= -_gcc=-Wno-unused-variable
 CERRWARN	+= -_gcc=-Wno-implicit-function-declaration
 YFLAGS		+= -d -v
-CFLAGS 		+= -D_FILE_OFFSET_BITS=64
+CFLAGS		+= -D_FILE_OFFSET_BITS=64
 
 # dump_expr() is too hairy
 SMATCH=off
 
 $(ITM) :=	CFLAGS += $(GSHARED) $(C_PICFLAGS) $(ZTEXT) -h$@
-$(ITM) :=	CPPFLAGS += -D_REENTRANT 
+$(ITM) :=	CPPFLAGS += -D_REENTRANT
 $(ITM) :=	sparc_CFLAGS += -xregs=no%appl
 $(ITM) :=	sparcv9_CFLAGS += -xregs=no%appl
 
@@ -172,11 +171,7 @@ cstyle: $(SRCS)
 clean:
 	$(RM) $(CLEANFILES)
 
-debug:
-	$(MAKE)	all COPTFLAG='' COPTFLAG64='' CFLAGS='-g -DDEBUG'
-
-
-%.o:	%.c 
+%.o:	%.c
 	$(COMPILE.c) $<
 
 %.o:	../%.c
@@ -185,7 +180,6 @@ debug:
 
 
 # install rule
-# 
 $(ROOTDIRS32)/%: $(ROOTDIRS32) %
 	-$(INS.file)
 
diff --git a/usr/src/cmd/hal/addons/cpufreq/Makefile b/usr/src/cmd/hal/addons/cpufreq/Makefile
index 1fdf1ad83c..ce5fc8d4f4 100644
--- a/usr/src/cmd/hal/addons/cpufreq/Makefile
+++ b/usr/src/cmd/hal/addons/cpufreq/Makefile
@@ -37,7 +37,8 @@ LDLIBS +=	-lc -ldbus-1 -lhal -lglib-2.0 -ldbus-glib-1 -lpolkit -lbsm
 
 CPPFLAGS +=	$(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS)
 CPPFLAGS +=	-I$(ROOT)/usr/include/hal -I../../hald
-CPPFLAGS +=	-I$(ROOT)/usr/include/libpolkit -g
+CPPFLAGS +=	-I$(ROOT)/usr/include/libpolkit
+CFLAGS +=	$(CCGDEBUG)
 CSTD =	$(CSTD_GNU99)
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/idmap/idmap/Makefile b/usr/src/cmd/idmap/idmap/Makefile
index e8d87e4d9c..7f62b99649 100644
--- a/usr/src/cmd/idmap/idmap/Makefile
+++ b/usr/src/cmd/idmap/idmap/Makefile
@@ -27,7 +27,7 @@ PROG =		idmap
 CLIENTOBJS =	idmap.o idmap_engine.o namemaps.o
 # idmap_clnt.o
 CLIENTSRCS =	$(CLIENTOBJS:%.o=%.c)
-POFILES = 	$(CLIENTOBJS:.o=.po)
+POFILES =	$(CLIENTOBJS:.o=.po)
 OBJS =		$(CLIENTOBJS)
 SRCS =		$(CLIENTSRCS)
 IDMAP_PROT_DIR =        $(SRC)/head/rpcsvc
@@ -45,7 +45,7 @@ CERRWARN +=	-_gcc=-Wno-address
 # not linted
 SMATCH=off
 
-POFILE = 	$(PROG)_all.po
+POFILE =	$(PROG)_all.po
 LDLIBS +=	-lidmap -ladutils -lsldap -lldap
 FILEMODE =	0555
 
@@ -66,7 +66,7 @@ lint_SRCS :=	CPPFLAGS += $(INCS)
 all: $(PROG)
 
 $(PROG): $(OBJS)
-	$(LINK.c) -g -o $@ $(OBJS) $(LDLIBS)
+	$(LINK.c) $(CCGDEBUG) -o $@ $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)
 
 $(POFILE): $(POFILES)
diff --git a/usr/src/cmd/idmap/nltest/Makefile b/usr/src/cmd/idmap/nltest/Makefile
index 1e6cb034fd..887c19880f 100644
--- a/usr/src/cmd/idmap/nltest/Makefile
+++ b/usr/src/cmd/idmap/nltest/Makefile
@@ -27,13 +27,13 @@ PROG =		nltest
 CLIENTOBJS =	nltest.o
 
 CLIENTSRCS =	$(CLIENTOBJS:%.o=%.c)
-POFILES = 	$(CLIENTOBJS:.o=.po)
+POFILES =	$(CLIENTOBJS:.o=.po)
 OBJS =		$(CLIENTOBJS)
 SRCS =		$(CLIENTSRCS)
 
 include ../../Makefile.cmd
 
-POFILE = 	$(PROG)_all.po
+POFILE =	$(PROG)_all.po
 LDLIBS +=	-lads -luuid
 FILEMODE =	0555
 
@@ -50,7 +50,7 @@ lint_SRCS :=	CPPFLAGS += $(INCS)
 all: $(PROG)
 
 $(PROG): $(OBJS)
-	$(LINK.c) -g -o $@ $(OBJS) $(LDLIBS)
+	$(LINK.c) $(CCGDEBUG) -o $@ $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)
 
 $(POFILE): $(POFILES)
diff --git a/usr/src/cmd/idmap/test-getdc/Makefile b/usr/src/cmd/idmap/test-getdc/Makefile
index 10238ebb01..1ae331fa4a 100644
--- a/usr/src/cmd/idmap/test-getdc/Makefile
+++ b/usr/src/cmd/idmap/test-getdc/Makefile
@@ -27,11 +27,11 @@ PROG =		test-getdc
 OBJS =		getdc_main.o
 
 SRCS =	$(OBJS:%.o=%.c)
-POFILES = 	$(OBJS:.o=.po)
+POFILES =	$(OBJS:.o=.po)
 
 include ../../Makefile.cmd
 
-POFILE = 	$(PROG)_all.po
+POFILE =	$(PROG)_all.po
 
 LDLIBS +=	-ladutils -lnsl -lumem
 LDFLAGS +=	-R'$$ORIGIN/../lib'
@@ -51,7 +51,7 @@ lint_SRCS :=	CPPFLAGS += $(INCS)
 all: $(PROG)
 
 $(PROG): $(OBJS) FRC
-	$(LINK.c) -g -o $@ $(OBJS) $(LDLIBS)
+	$(LINK.c) $(CCGDEBUG) -o $@ $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)
 
 $(POFILE): $(POFILES)
diff --git a/usr/src/cmd/mdb/sun4u/Makefile.kmdb b/usr/src/cmd/mdb/sun4u/Makefile.kmdb
index b19c14a9a4..dc58c5e066 100644
--- a/usr/src/cmd/mdb/sun4u/Makefile.kmdb
+++ b/usr/src/cmd/mdb/sun4u/Makefile.kmdb
@@ -86,7 +86,7 @@ MAPFILE_SOURCES = \
 %.fth: $(SRC)/cmd/mdb/sparc/kmdb/%.fdbg
 	grep '^#' <$< >$(<F).c
 	grep -v '^#' <$< >$(<F).tmp
-	$(CC) $(CTFSTABSCFLAGS) $(CPPFLAGS) -g -c -o $(<F).o $(<F).c
+	$(CC) $(CTFSTABSCFLAGS) $(CPPFLAGS) $(CCGDEBUG) -c -o $(<F).o $(<F).c
 	$(CTFCONVERT) $(CTFCVTFLAGS) $(<F).o
 	$(CTFSTABS) -t forth -i $(<F).tmp -o $@ $(<F).o
 	$(RM) $(<F).c $(<F).tmp $(<F).o
diff --git a/usr/src/cmd/mdb/sun4v/Makefile.kmdb b/usr/src/cmd/mdb/sun4v/Makefile.kmdb
index 335d3ec082..6412a9f017 100644
--- a/usr/src/cmd/mdb/sun4v/Makefile.kmdb
+++ b/usr/src/cmd/mdb/sun4v/Makefile.kmdb
@@ -95,7 +95,7 @@ MAPFILE_SOURCES = \
 %.fth: $(SRC)/cmd/mdb/sparc/kmdb/%.fdbg
 	grep '^#' <$< >$(<F).c
 	grep -v '^#' <$< >$(<F).tmp
-	$(CC) $(CTFSTABSCFLAGS) $(CPPFLAGS) -g -c -o $(<F).o $(<F).c
+	$(CC) $(CTFSTABSCFLAGS) $(CPPFLAGS) $(CCGDEBUG) -c -o $(<F).o $(<F).c
 	$(CTFCONVERT) $(CTFCVTFLAGS) $(<F).o
 	$(CTFSTABS) -t forth -i $(<F).tmp -o $@ $(<F).o
 	$(RM) $(<F).c $(<F).tmp $(<F).o
diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
index 187517ea11..66e2527c01 100644
--- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
@@ -35,7 +35,7 @@ JNIHDR_FILES =	com_sun_admin_pm_server_DoPrinterNS.h
 
 OBJECTS =	DoPrinterNS.o NS.o
 
-CLASSFILES = 	Printer.class \
+CLASSFILES =	Printer.class \
 		Host.class \
 		SysCommand.class \
 		NameService.class \
@@ -111,7 +111,7 @@ $(JNIHDR_FILES): $(JNICLASSFILES)
 # Build standalone programs for testing
 #
 NS: NS.c
-	$(CC) NS.c -g $(ILDOFF) -o NS -DMAIN=1 $(ENVLDLIBS1) $(ENVLIBS2) \
+	$(CC) NS.c $(CCGDEBUG) $(ILDOFF) -o NS -DMAIN=1 $(ENVLDLIBS1) $(ENVLIBS2) \
 	    -lprint -lnsl -lsocket
 
 lint: $(JNIHDR_FILES) lintcheck
diff --git a/usr/src/cmd/sort/Makefile.com b/usr/src/cmd/sort/Makefile.com
index ef195b2ce1..75affc95a3 100644
--- a/usr/src/cmd/sort/Makefile.com
+++ b/usr/src/cmd/sort/Makefile.com
@@ -75,7 +75,7 @@ CLEANFILES = $(OBJS) $(XPG4OBJS) $(LNTS)
 include ../../Makefile.cmd
 
 SED =		sed
-DCFILE = 	$(PROG).dc
+DCFILE =	$(PROG).dc
 
 SPACEFLAG =
 SPACEFLAG64 =
@@ -94,10 +94,10 @@ SMATCH=off
 
 $(XPG4)	:=	CFLAGS += -DXPG4
 
-debug :=	SORT_DEBUG = -g -DDEBUG $(ILDOFF)
+debug :=	SORT_DEBUG = $(CCGDEBUG) -DDEBUG $(ILDOFF)
 debug :=	COPTFLAG =
 debug :=	COPTFLAG64 =
-stats	:=	SORT_DEBUG = -g -DSTATS -DDEBUG $(ILDOFF)
+stats	:=	SORT_DEBUG = $(CCGDEBUG) -DSTATS -DDEBUG $(ILDOFF)
 stats	:=	COPTFLAG =
 stats	:=	COPTFLAG64 =
 
diff --git a/usr/src/cmd/stmfproxy/stmfproxy/Makefile b/usr/src/cmd/stmfproxy/stmfproxy/Makefile
index 73d75ce1df..f3626f2112 100644
--- a/usr/src/cmd/stmfproxy/stmfproxy/Makefile
+++ b/usr/src/cmd/stmfproxy/stmfproxy/Makefile
@@ -57,11 +57,6 @@ CCVERBOSE	=
 LDLIBS += -lnsl -lstmf -lstmfproxy
 CPPFLAGS += -I. -I$(COMMONBASE)/cmdparse
 
-# Uncomment the following to help with debugging
-#CFLAGS += -g 
-#i386_COPTFLAG=
-#i386_CCOPTFLAG=
-
 .KEEP_STATE:
 
 $(PROG): $(OBJS)
diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile
index fc42a8b0c3..0e50a1a293 100644
--- a/usr/src/cmd/svc/svccfg/Makefile
+++ b/usr/src/cmd/svc/svccfg/Makefile
@@ -47,7 +47,7 @@ MYOBJS =	$(SRCS:%.c=%.o) \
 		notify_params.o
 OBJS =		$(MYOBJS)
 
-POFILES = 	$(SRCS:%.c=%.po) \
+POFILES =	$(SRCS:%.c=%.po) \
 		svccfg_grammar.po \
 		svccfg_lex.po \
 		../common/manifest_find.po \
@@ -97,8 +97,6 @@ LIBSCF		= $(SRC)/lib/libscf
 LIBTECLA	= $(SRC)/lib/libtecla		# just for the header
 LIBUUTIL	= $(SRC)/lib/libuutil
 
-debug := COPTFLAG = -g
-
 lint := LINTFLAGS = -mux
 lint := SVCCFG_EXTRA_LIBS = -lscf -ll -luutil -lumem -lmd5 -lnvpair
 
diff --git a/usr/src/cmd/tnf/prex/Makefile.com b/usr/src/cmd/tnf/prex/Makefile.com
index 871583d0aa..90303b6aa7 100644
--- a/usr/src/cmd/tnf/prex/Makefile.com
+++ b/usr/src/cmd/tnf/prex/Makefile.com
@@ -62,8 +62,6 @@ YFLAGS=		-d
 LFLAGS=		-v
 # FOR normal makefile, uncomment the next line
 LDLIBS +=	-lgen -ltnfctl -lelf -lc
-# Uncomment the following line for a debug build
-# COPTFLAG =	-g -DDEBUG
 
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-unused-label
@@ -112,7 +110,7 @@ $(POFILE):      $(POFILES)
 clean:
 	$(RM) $(OBJS) $(CLEANFILES)
 
-lint: $(OBJS) 
+lint: $(OBJS)
 	$(LINT.c) $(SRCS)
 
 include	../../../Makefile.targ
diff --git a/usr/src/cmd/zlook/Makefile.com b/usr/src/cmd/zlook/Makefile.com
index 06627ad814..fe96088124 100644
--- a/usr/src/cmd/zlook/Makefile.com
+++ b/usr/src/cmd/zlook/Makefile.com
@@ -30,8 +30,8 @@ include ../../Makefile.cmd
 
 CSTD= $(CSTD_GNU99)
 C99LMODE= -Xc99=%all
-CFLAGS += -g $(CCVERBOSE)
-CFLAGS64 += -g $(CCVERBOSE)
+CFLAGS += $(CCGDEBUG) $(CCVERBOSE)
+CFLAGS64 += $(CCGDEBUG) $(CCVERBOSE)
 CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS)
 
 CERRWARN += -_gcc=-Wno-uninitialized
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com
index 3513856775..92afe8303f 100644
--- a/usr/src/lib/libc/sparc/Makefile.com
+++ b/usr/src/lib/libc/sparc/Makefile.com
@@ -1408,7 +1408,7 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h
 
 # assym.h build rules
 
-assym.h := CFLAGS += -g
+assym.h := CFLAGS += $(CCGDEBUG)
 
 GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
 
diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com
index 39f4b4be28..6e2b07ed2d 100644
--- a/usr/src/lib/libc/sparcv9/Makefile.com
+++ b/usr/src/lib/libc/sparcv9/Makefile.com
@@ -1322,7 +1322,7 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h
 
 # assym.h build rules
 
-assym.h := CFLAGS64 += -g
+assym.h := CFLAGS64 += $(CCGDEBUG)
 
 GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
 
diff --git a/usr/src/lib/libexacct/Makefile.com b/usr/src/lib/libexacct/Makefile.com
index bc3332a971..0be4ef3c27 100644
--- a/usr/src/lib/libexacct/Makefile.com
+++ b/usr/src/lib/libexacct/Makefile.com
@@ -35,18 +35,18 @@ SRCS=		$(COMMON_OBJS:%.o=../../../common/exacct/%.c) \
 		$(LIB_OBJS:%.o=../common/%.c)
 
 LIBS =		$(DYNLIB) $(LINTLIB)
-LDLIBS += 	-lc
+LDLIBS +=	-lc
 
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-CFLAGS += 	$(CCVERBOSE)
+CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CPPFLAGS +=	-D_FILE_OFFSET_BITS=64
 
 debug :=	CPPFLAGS += -DLIBEXACCT_DEBUG
-debug :=	COPTFLAG = -g
-debug :=	COPTFLAG64 = -g
+debug :=	COPTFLAG = $(CCGDEBUG)
+debug :=	COPTFLAG64 = $(CCGDEBUG)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libsmbfs/Makefile.com b/usr/src/lib/libsmbfs/Makefile.com
index 872e8222a5..160494aff1 100644
--- a/usr/src/lib/libsmbfs/Makefile.com
+++ b/usr/src/lib/libsmbfs/Makefile.com
@@ -114,12 +114,6 @@ CPPFLAGS += -D__EXTENSIONS__ -D_REENTRANT -DMIA \
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
-# uncomment these for dbx debugging
-#COPTFLAG = -g
-#CTF_FLAGS =
-#CTFCONVERT_O=
-#CTFMERGE_LIB=
-
 # Filter out the less important lint.
 # See lgrep.awk
 LGREP =	$(AWK) -f $(SRCDIR)/lgrep.awk
diff --git a/usr/src/lib/libtnfctl/Makefile.com b/usr/src/lib/libtnfctl/Makefile.com
index e3e14c3304..bbc56e5257 100644
--- a/usr/src/lib/libtnfctl/Makefile.com
+++ b/usr/src/lib/libtnfctl/Makefile.com
@@ -66,13 +66,11 @@ HDRS=		tnfctl.h
 ROOTHDRDIR=	$(ROOT)/usr/include/tnf
 ROOTHDRS=	$(HDRS:%=$(ROOTHDRDIR)/%)
 CHECKHDRS=	$(HDRS:%.h=%.check)
-$(ROOTHDRS) := 	FILEMODE = 0644
+$(ROOTHDRS) :=	FILEMODE = 0644
 CHECKHDRS =	$(HDRS:%.h=%.check)
 
 LDLIBS +=	-lc -lelf
 
-# Uncomment the following line for a debug build
-# COPTFLAG =	-g -DDEBUG $(CCVERBOSE)
 CPPFLAGS +=	-I$(SRC)/lib/libtnfprobe -D_REENTRANT -I$(SRC)/cmd/sgs/include
 
 LINTFLAGS +=	-y
diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com
index 99f7cd70eb..8106ab5c49 100644
--- a/usr/src/lib/libzpool/Makefile.com
+++ b/usr/src/lib/libzpool/Makefile.com
@@ -66,8 +66,8 @@ $(LIBS): ../common/zfs.h
 CSTD=	$(CSTD_GNU99)
 C99LMODE=	-Xc99=%all
 
-CFLAGS +=	-g $(CCVERBOSE) $(CNOGLOBAL)
-CFLAGS64 +=	-g $(CCVERBOSE)	$(CNOGLOBAL)
+CFLAGS +=	$(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL)
+CFLAGS64 +=	$(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL)
 LDLIBS +=	-lcmdutils -lumem -lavl -lnvpair -lz -lc -lsysevent -lmd \
 		-lfakekernel
 CPPFLAGS.first =	-I$(SRC)/lib/libfakekernel/common
diff --git a/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com b/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com
index 074e316b28..ce8ce63fe3 100644
--- a/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com
+++ b/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com
@@ -187,9 +187,9 @@ include ../../../Makefile.lib
 include ../../Makefile.lib
 
 # Force SOURCEDEBUG
-CSOURCEDEBUGFLAGS	= -g
-CCSOURCEDEBUGFLAGS	= -g
-STRIP_STABS 	= :
+CSOURCEDEBUGFLAGS	= $(CCGDEBUG)
+CCSOURCEDEBUGFLAGS	= $(CCGDEBUG)
+STRIP_STABS	= :
 
 
 # Note: need our sys includes _before_ ENVCPPFLAGS, proto etc.
diff --git a/usr/src/lib/udapl/libdat/Makefile.com b/usr/src/lib/udapl/libdat/Makefile.com
index 254241680d..8694c77788 100644
--- a/usr/src/lib/udapl/libdat/Makefile.com
+++ b/usr/src/lib/udapl/libdat/Makefile.com
@@ -23,8 +23,8 @@
 # Use is subject to license terms.
 #
 
-LIBRARY=       	libdat.a 
-VERS=          	.1 
+LIBRARY=	libdat.a
+VERS=		.1
 
 OBJECTS =	\
 	dat_dictionary.o \
@@ -36,16 +36,16 @@ OBJECTS =	\
 	dat_api.o \
 	udat.o	\
 	udat_api.o \
-	udat_sr_parser.o 
+	udat_sr_parser.o
 
 include ../../../Makefile.lib
 
-LIBS = 	$(DYNLIB) $(LINTLIB)
+LIBS =	$(DYNLIB) $(LINTLIB)
 LDLIBS += -lc
 
 SRCDIR =	../common
 
-CPPFLAGS +=     -I../include 
+CPPFLAGS +=     -I../include
 CFLAGS +=	$(CCVERBOSE)
 LINTFLAGS +=	-DDEBUG
 LINTFLAGS64 +=	-DDEBUG
@@ -54,8 +54,6 @@ $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 CERRWARN +=	-_gcc=-Wno-type-limits
 
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
-debug := COPTFLAG = -g
-debug := COPTFLAG64 = -g
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/udapl/udapl_tavor/Makefile.com b/usr/src/lib/udapl/udapl_tavor/Makefile.com
index 4671bea78d..a2b1711a4c 100644
--- a/usr/src/lib/udapl/udapl_tavor/Makefile.com
+++ b/usr/src/lib/udapl/udapl_tavor/Makefile.com
@@ -24,8 +24,8 @@
 #
 # Copyright (c) 2018, Joyent, Inc.
 
-LIBRARY=       	udapl_tavor.a
-VERS=          	.1
+LIBRARY=	udapl_tavor.a
+VERS=		.1
 
 LOCOBJS =	\
 	dapl_cno_create.o \
@@ -157,8 +157,6 @@ CERRWARN +=	-_gcc=-Wno-switch
 SMATCH=off
 
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDAPL_DBG
-debug := COPTFLAG = -g
-debug := COPTFLAG64 = -g
 
 .KEEP_STATE:
 
diff --git a/usr/src/tools/cw/cw.c b/usr/src/tools/cw/cw.c
index eaa58a1c3e..3113c79511 100644
--- a/usr/src/tools/cw/cw.c
+++ b/usr/src/tools/cw/cw.c
@@ -39,7 +39,7 @@
  */
 
 /* If you modify this file, you must increment CW_VERSION */
-#define	CW_VERSION	"3.0"
+#define	CW_VERSION	"4.0"
 
 /*
  * -#		Verbose mode
@@ -217,7 +217,6 @@
  * -xCC				ignore
  * -xchip=<c>			table
  * -xcode=<c>			table
- * -xdebugformat=<format>	ignore (always use dwarf-2 for gcc)
  * -xcrossfile[=<n>]		ignore
  * -xe				error
  * -xF				error
@@ -762,9 +761,6 @@ do_gcc(cw_ictx_t *ctx)
 			}
 			error(arg);
 			break;
-		case 'g':
-			newae(ctx->i_ae, "-gdwarf-2");
-			break;
 		case 'E':
 			if (arglen == 1) {
 				newae(ctx->i_ae, "-xc");
@@ -792,6 +788,7 @@ do_gcc(cw_ictx_t *ctx)
 			error(arg);
 			break;
 		case 'A':
+		case 'g':
 		case 'h':
 		case 'I':
 		case 'i':
@@ -1105,11 +1102,6 @@ do_gcc(cw_ictx_t *ctx)
 					break;
 				error(arg);
 				break;
-			case 'd':
-				if (strncmp(arg, "-xdebugformat=", 14) == 0)
-					break;
-				error(arg);
-				break;
 			case 'F':
 				/*
 				 * Compile for mapfile reordering, or unused
diff --git a/usr/src/uts/intel/cxgbe/cxgbe/Makefile b/usr/src/uts/intel/cxgbe/cxgbe/Makefile
index 19c7d29776..a9600cce5e 100644
--- a/usr/src/uts/intel/cxgbe/cxgbe/Makefile
+++ b/usr/src/uts/intel/cxgbe/cxgbe/Makefile
@@ -43,7 +43,7 @@ ALL_TARGET = $(BINARY)
 LINT_TARGET = $(MODULE).lint
 INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
 
-CFLAGS += -g -I$(UTSBASE)/common/io/cxgbe -I$(UTSBASE)/common/io/cxgbe/common \
+CFLAGS += -I$(UTSBASE)/common/io/cxgbe -I$(UTSBASE)/common/io/cxgbe/common \
 	-I$(UTSBASE)/common/io/cxgbe/t4nex -I$(UTSBASE)/common/io/cxgbe/shared
 
 #
diff --git a/usr/src/uts/intel/cxgbe/t4nex/Makefile b/usr/src/uts/intel/cxgbe/t4nex/Makefile
index 20ddeb8cf7..0c22a89391 100644
--- a/usr/src/uts/intel/cxgbe/t4nex/Makefile
+++ b/usr/src/uts/intel/cxgbe/t4nex/Makefile
@@ -48,7 +48,7 @@ ALL_TARGET = $(BINARY)
 LINT_TARGET = $(MODULE).lint
 INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
 
-CFLAGS += -g -I$(UTSBASE)/common/io/cxgbe -I$(UTSBASE)/common/io/cxgbe/common \
+CFLAGS += -I$(UTSBASE)/common/io/cxgbe -I$(UTSBASE)/common/io/cxgbe/common \
 	-I$(UTSBASE)/common/io/cxgbe/t4nex -I$(UTSBASE)/common/io/cxgbe/shared \
 	-I$(UTSBASE)/common/io/cxgbe/firmware