Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- src/share/mk/bsd.prog.mk	2009/12/14 08:51:16	1.246
+++ src/share/mk/bsd.prog.mk	2010/03/02 20:49:18	1.247
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.246 2009/12/14 08:51:16 mrg Exp $
+#	$NetBSD: bsd.prog.mk,v 1.247 2010/03/02 20:49:18 darran Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -63,6 +63,12 @@ CFLAGS+=	${COPTS}
 OBJCFLAGS+=	${OBJCOPTS}
 MKDEP_SUFFIXES?=	.o .ln
 
+# CTF preserve debug symbols
+.if defined(MKDTRACE) && (${MKDTRACE} != "no") && (${CFLAGS:M-g} != "")
+CTFFLAGS+= -g
+CTFMFLAGS+= -g
+.endif
+
 # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
 .if ${OBJECT_FMT} == "ELF"
 .ifndef LIBCRTBEGIN
@@ -299,6 +305,9 @@ ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
 	    ${OBJS.${_P}} ${_LDADD.${_P}} \
 	    ${DESTDIR:D-L${_GCC_LIBGCCDIR}} \
 	    ${_PROGLDOPTS}
+.if defined(CTFMERGE)
+	${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
+.endif
 .if defined(PAXCTL_FLAGS.${_P})
 	${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
 .endif