From owner-p4-projects@FreeBSD.ORG  Wed Aug 28 22:20:28 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 0DA6CB28; Wed, 28 Aug 2013 22:20:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C2F01B26
 for <perforce@freebsd.org>; Wed, 28 Aug 2013 22:20:27 +0000 (UTC)
 (envelope-from novazeta@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AF8BC2C6E
 for <perforce@freebsd.org>; Wed, 28 Aug 2013 22:20:27 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SMKRIB094929
 for <perforce@freebsd.org>; Wed, 28 Aug 2013 22:20:27 GMT
 (envelope-from novazeta@FreeBSD.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r7SMKRNV094926
 for perforce@freebsd.org; Wed, 28 Aug 2013 22:20:27 GMT
 (envelope-from novazeta@FreeBSD.org)
Date: Wed, 28 Aug 2013 22:20:27 GMT
Message-Id: <201308282220.r7SMKRNV094926@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 novazeta@FreeBSD.org using -f
From: Khilan Gudka <novazeta@FreeBSD.org>
Subject: PERFORCE change 497537 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: Wed, 28 Aug 2013 22:20:28 -0000

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

Change 497537 by novazeta@novazeta_zenith on 2013/08/28 22:19:59

	Extended llvm build stuff to link together individual bitcode files into a single program bitcode file. 

Affected files ...

.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#11 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#11 (text+ko) ====

@@ -68,7 +68,7 @@
 INSTR_IRS=	${LLVM_CFILES:R:S/$/.instr${LLVM_IR_TYPE}/}
 INSTR_OBJS=	${LLVM_CFILES:R:S/$/.instro/}
 OBJS+=		${INSTR_OBJS}
-CLEANFILES+=	${OIRS} ${INSTR_IRS} ${INSTR_OBJS}
+CLEANFILES+=	${OIRS} ${INSTR_IRS} ${INSTR_OBJS} ${PROG}.${LLVM_IR_TYPE}-a
 .if ${MK_TESLA} != "no"
 TESLA_FILES=	${LLVM_CFILES:R:S/$/.tesla/}
 CLEANFILES+=	${TESLA_FILES} tesla.manifest
@@ -79,6 +79,14 @@
 beforelinking: ${OBJS}
 ${PROG}: beforelinking
 .endif
+
+${PROG}.${LLVM_IR_TYPE}-a: ${OIRS}
+	if [ -z "${OIRS}" ]; then \
+		touch ${.TARGET} ;\
+	else \
+		${LLVM_LINK} -o ${.TARGET} ${OIRS} ;\
+	fi
+
 ${PROG}: ${OBJS}
 .if defined(PROG_CXX)
 	${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
@@ -110,7 +118,11 @@
 .endif
 .endif # defined(PROG)
 
+.if defined(WITH_LLVM_INSTRUMENTED)
+all: objwarn ${PROG} ${PROG}.${LLVM_IR_TYPE}-a ${SCRIPTS}
+.else
 all: objwarn ${PROG} ${SCRIPTS}
+.endif
 .if ${MK_MAN} != "no"
 all: _manpages
 .endif