Print this page
Code review comments

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master
          +++ new/usr/src/Makefile.master
↓ open down ↓ 476 lines elided ↑ open up ↑
 477  477  # source will yeild objects that always look different.
 478  478  #
 479  479  # In the same spirit, this will also remove the date from the N_OPT stab.
 480  480  CGLOBALSTATIC= -W0,-xglobalstatic
 481  481  
 482  482  # Sometimes we want all symbols and types in debugging information even
 483  483  # if they aren't used.
 484  484  CALLSYMS=       -W0,-xdbggen=no%usedonly
 485  485  
 486  486  #
 487      -# Default debug format for Sun Studio 11 is dwarf, so force it to
 488      -# generate stabs.
      487 +# We force the compilers to generate the debugging information best understood
      488 +# by the CTF tools.  With Sun Studio this is stabs due to bugs in the Studio
      489 +# compilers.  With GCC this is DWARF v2.
 489  490  #
 490  491  DEBUGFORMAT=    -_cc=-xdebugformat=stabs -_gcc=-gdwarf-2
 491  492  
 492  493  #
 493  494  # Ask the compiler to include debugging information
 494  495  #
 495  496  CCGDEBUG= -g $(DEBUGFORMAT)
 496  497  
 497  498  #
 498      -# Flags used to build in debug mode for ctf generation.  Bugs in the Devpro
 499      -# compilers currently prevent us from building with cc-emitted DWARF.
      499 +# Flags used to build in debug mode for ctf generation.  
 500  500  #
 501  501  CTF_FLAGS_sparc = $(CCGDEBUG) -Wc,-Qiselect-T1 $(CSTD) $(CNOGLOBAL)
 502  502  CTF_FLAGS_i386  = $(CCGDEBUG) $(CSTD) $(CNOGLOBAL)
 503  503  
 504  504  CTF_FLAGS_sparcv9       = $(CTF_FLAGS_sparc)
 505  505  CTF_FLAGS_amd64         = $(CTF_FLAGS_i386)
 506  506  
 507  507  # Sun Studio produces broken userland code when saving arguments.
 508  508  $(__GNUC)CTF_FLAGS_amd64 += $(SAVEARGS)
 509  509  
 510  510  CTF_FLAGS_32    = $(CTF_FLAGS_$(MACH))
 511  511  CTF_FLAGS_64    = $(CTF_FLAGS_$(MACH64))
 512  512  CTF_FLAGS       = $(CTF_FLAGS_32)
 513  513  
 514  514  #
 515  515  # Flags used with genoffsets
 516  516  #
 517      -GENOFFFLAGS = $(CALLSYMS)
      517 +GENOFFSETS_FLAGS = $(CALLSYMS)
 518  518  
 519  519  OFFSETS_CREATE = $(GENOFFSETS) -s $(CTFSTABS) -r $(CTFCONVERT) \
 520      -        $(CW) --noecho $(CW_CC_COMPILERS) -- $(GENOFFFLAGS) $(CFLAGS) $(CPPFLAGS)
      520 +        $(CW) --noecho $(CW_CC_COMPILERS) -- $(GENOFFSETS_FLAGS) \
      521 +        $(CFLAGS) $(CPPFLAGS)
 521  522  
 522  523  OFFSETS_CREATE64 = $(GENOFFSETS) -s $(CTFSTABS) -r $(CTFCONVERT) \
 523      -        $(CW) --noecho $(CW_CC_COMPILERS) -- $(GENOFFFLAGS) $(CFLAGS64) $(CPPFLAGS)
      524 +        $(CW) --noecho $(CW_CC_COMPILERS) -- $(GENOFFSETS_FLAGS) \
      525 +        $(CFLAGS64) $(CPPFLAGS)
 524  526  
 525  527  #
 526  528  # tradeoff time for space (smaller is better)
 527  529  #
 528  530  sparc_SPACEFLAG         = -xspace -W0,-Lt
 529  531  sparcv9_SPACEFLAG       = -xspace -W0,-Lt
 530  532  i386_SPACEFLAG          = -xspace
 531  533  amd64_SPACEFLAG         =
 532  534  
 533  535  SPACEFLAG               = $($(MACH)_SPACEFLAG)
↓ open down ↓ 672 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX