Print this page
10051 cw(1) shouldn't have to translate -g
@@ -484,33 +484,38 @@
#
# Default debug format for Sun Studio 11 is dwarf, so force it to
# generate stabs.
#
-DEBUGFORMAT= -xdebugformat=stabs
+DEBUGFORMAT= -_cc=-xdebugformat=stabs -_gcc=-gdwarf-2
+
+#
+# Ask the compiler to include debugging information
+#
+CCGDEBUG= -g $(DEBUGFORMAT)
#
# Flags used to build in debug mode for ctf generation. Bugs in the Devpro
# compilers currently prevent us from building with cc-emitted DWARF.
#
-CTF_FLAGS_sparc = -g -Wc,-Qiselect-T1 $(CSTD) $(CNOGLOBAL) $(CDWARFSTR)
-CTF_FLAGS_i386 = -g $(CSTD) $(CNOGLOBAL) $(CDWARFSTR)
+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)
# 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)
+GOFLAGS = $(CALLSYMS)
OFFSETS_CREATE = $(GENOFFSETS) -s $(CTFSTABS) -r $(CTFCONVERT) \
$(CW) --noecho $(CW_CC_COMPILERS) -- $(GOFLAGS) $(CFLAGS) $(CPPFLAGS)
OFFSETS_CREATE64 = $(GENOFFSETS) -s $(CTFSTABS) -r $(CTFCONVERT) \
@@ -567,12 +572,12 @@
CCUSERFLAGS =
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) \
$(CGLOBALSTATIC) $(CCNOAUTOINLINE) $(CCNOREORDER) \
$(CSOURCEDEBUGFLAGS) $(CUSERFLAGS)