From owner-svn-src-all@FreeBSD.ORG  Thu Jan 15 02:41:26 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC0F91065676;
	Thu, 15 Jan 2009 02:41:26 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A99F78FC0A;
	Thu, 15 Jan 2009 02:41:26 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0F2fQVp060824;
	Thu, 15 Jan 2009 02:41:26 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0F2fQ7B060823;
	Thu, 15 Jan 2009 02:41:26 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <200901150241.n0F2fQ7B060823@svn.freebsd.org>
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Thu, 15 Jan 2009 02:41:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187260 - head/sys/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jan 2009 02:41:27 -0000

Author: rodrigc
Date: Thu Jan 15 02:41:26 2009
New Revision: 187260
URL: http://svn.freebsd.org/changeset/base/187260

Log:
  When building up the command-line for the DTrace ctfmerge and ctfconvert
  utilities, add the ${DEBUG} variable from the kernel config.  Otherwise,
  if we build a kernel with WITH_CTF=1 set, ctfmerge will not have
  the -g flag set.  In this case, the cc has -g specified, so the
  .o files will have debug information generated, but since ctfmerge
  does not have -g set, it will strip out the ELF sections containing
  the DWARF debugging info, leading to a kernel without debugging symbols.
  
  Reviewed by:	jb

Modified:
  head/sys/conf/kern.pre.mk

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Thu Jan 15 02:35:40 2009	(r187259)
+++ head/sys/conf/kern.pre.mk	Thu Jan 15 02:41:26 2009	(r187260)
@@ -129,7 +129,7 @@ NORMAL_M= ${AWK} -f $S/tools/makeobjops.
 	  ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
 
 .if defined(CTFCONVERT)
-NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+NORMAL_CTFCONVERT= ${CTFCONVERT} ${DEBUG} ${CTFFLAGS} ${.TARGET}
 .else
 NORMAL_CTFCONVERT=
 .endif
@@ -143,7 +143,7 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
 SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_OBJS+= hack.So
 .if defined(CTFMERGE)
-SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
+SYSTEM_CTFMERGE= ${CTFMERGE} ${DEBUG} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
 LD+= -g
 .endif
 SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} \