svn commit: r263995 - head/sys/conf

Warner Losh imp at FreeBSD.org
Tue Apr 1 14:24:21 UTC 2014


Author: imp
Date: Tue Apr  1 14:24:20 2014
New Revision: 263995
URL: http://svnweb.freebsd.org/changeset/base/263995

Log:
  Remove check for clang and expand the comment. Newer versions of gcc
  generate dwarf4 by default as well, so always force dwarf2 when
  generating debugging data. It is harmless on older versions of both
  clang and gcc, but required on newer ones.

Modified:
  head/sys/conf/kern.mk

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Tue Apr  1 14:24:15 2014	(r263994)
+++ head/sys/conf/kern.mk	Tue Apr  1 14:24:20 2014	(r263995)
@@ -164,10 +164,12 @@ CFLAGS+=	-fstack-protector
 .endif
 
 #
-# Add -gdwarf-2 when compiling -g on clang. The default starting in v3.4
-# is to generate DWARF version 4. However, our tools don't cope well with
-# DWARF 4, so force it to genereate DWARF2, which they understand.
+# Add -gdwarf-2 when compiling -g. The default starting in clang v3.4
+# and gcc 4.8 is to generate DWARF version 4. However, our tools don't
+# cope well with DWARF 4, so force it to genereate DWARF2, which they
+# understand. Do this unconditionally as it is harmless when not needed,
+# but critical for these newer versions.
 #
-.if ${COMPILER_TYPE} == "clang" && ${CFLAGS:M-g} != "" && ${CFLAGS:M-gdwarf*} == ""
+.if ${CFLAGS:M-g} != "" && ${CFLAGS:M-gdwarf*} == ""
 CFLAGS+=	-gdwarf-2
 .endif


More information about the svn-src-head mailing list