From owner-svn-src-head@FreeBSD.ORG  Tue Apr  1 14:24:21 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0D1D9B7B;
 Tue,  1 Apr 2014 14:24:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EEFFDA3E;
 Tue,  1 Apr 2014 14:24:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31EOKwQ015067;
 Tue, 1 Apr 2014 14:24:20 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31EOKei015066;
 Tue, 1 Apr 2014 14:24:20 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404011424.s31EOKei015066@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 1 Apr 2014 14:24:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263995 - head/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2014 14:24:21 -0000

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