From owner-svn-src-stable-8@FreeBSD.ORG  Mon Jun 27 18:19:54 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79540106566B;
	Mon, 27 Jun 2011 18:19:54 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 68F688FC0A;
	Mon, 27 Jun 2011 18:19:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5RIJskd008438;
	Mon, 27 Jun 2011 18:19:54 GMT (envelope-from kan@svn.freebsd.org)
Received: (from kan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5RIJsXE008436;
	Mon, 27 Jun 2011 18:19:54 GMT (envelope-from kan@svn.freebsd.org)
Message-Id: <201106271819.p5RIJsXE008436@svn.freebsd.org>
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Mon, 27 Jun 2011 18:19:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223601 - stable/8/sys/conf
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jun 2011 18:19:54 -0000

Author: kan
Date: Mon Jun 27 18:19:54 2011
New Revision: 223601
URL: http://svn.freebsd.org/changeset/base/223601

Log:
  Add missing support to generate well-formed CTF data in dynamic modules.

Modified:
  stable/8/sys/conf/kmod.mk

Modified: stable/8/sys/conf/kmod.mk
==============================================================================
--- stable/8/sys/conf/kmod.mk	Mon Jun 27 16:54:59 2011	(r223600)
+++ stable/8/sys/conf/kmod.mk	Mon Jun 27 18:19:54 2011	(r223601)
@@ -132,6 +132,10 @@ CFLAGS+=	-mlongcall -fno-omit-frame-poin
 CFLAGS+=	-G0 -fno-pic -mno-abicalls -mlong-calls
 .endif
 
+.if defined(DEBUG) || defined(DEBUG_FLAGS)
+CTFFLAGS+=      -g
+.endif
+
 .if defined(FIRMWS)
 .if !exists(@)
 ${KMOD:S/$/.c/}: @
@@ -197,6 +201,9 @@ ${KMOD}.kld: ${OBJS}
 ${FULLPROG}: ${OBJS}
 .endif
 	${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
+.if defined(WITH_CTF)
+	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
+.endif
 .if defined(EXPORT_SYMS)
 .if ${EXPORT_SYMS} != YES
 .if ${EXPORT_SYMS} == NO