From owner-p4-projects@FreeBSD.ORG  Thu Jul 11 19:09:03 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id AF4131FD; Thu, 11 Jul 2013 19:09:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 715A61FB
 for <perforce@freebsd.org>; Thu, 11 Jul 2013 19:09:03 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id 6285F1FEF
 for <perforce@freebsd.org>; Thu, 11 Jul 2013 19:09:03 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6BJ93M7065537
 for <perforce@freebsd.org>; Thu, 11 Jul 2013 19:09:03 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6BJ93fm065534
 for perforce@freebsd.org; Thu, 11 Jul 2013 19:09:03 GMT
 (envelope-from brooks@freebsd.org)
Date: Thu, 11 Jul 2013 19:09:03 GMT
Message-Id: <201307111909.r6BJ93fm065534@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 231035 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jul 2013 19:09:03 -0000

http://p4web.freebsd.org/@@231035?ac=10

Change 231035 by brooks@brooks_zenith on 2013/07/11 19:08:55

	Run ctfconvert on tesla object files and ctfmerge on insturmented
	binaries.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#10 edit
.. //depot/projects/ctsrd/tesla/src/sys/conf/kern.post.mk#3 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#10 (text+ko) ====

@@ -281,6 +281,7 @@
 
 .instrll.instro: tesla.manifest
 	${LLC} -filetype=obj ${LLCFLAGS} ${.IMPSRC} -o ${.TARGET}
+	${CTFCONVERT_CMD}
 
 .manifest.dot:
 	${TESLA} graph ${.IMPSRC} -o ${.TARGET}

==== //depot/projects/ctsrd/tesla/src/sys/conf/kern.post.mk#3 (text+ko) ====

@@ -184,6 +184,9 @@
 	${LD} -Bdynamic -T ${LDSCRIPT} ${LDFLAGS} --no-warn-mismatch \
 	    -warn-common -export-dynamic -dynamic-linker /red/herring \
 	    -o ${.TARGET} -X ${INSTROBJS} ${NOT_C_OBJS} vers.o hack.So
+.if ${MK_CTF} != "no"
+	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${INSTROBJS} ${NOT_C_OBJS} vers.o
+.endif
 
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like