From owner-p4-projects@FreeBSD.ORG  Mon Sep  8 04:50:08 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E7E09811; Mon,  8 Sep 2014 04:50:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EBD203E7
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:49:40 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 90D811B39
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:49:40 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nepV021707
 for <perforce@freebsd.org>; Mon, 8 Sep 2014 04:49:40 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884neYe021704
 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:40 GMT
 (envelope-from brooks@freebsd.org)
Date: Mon, 8 Sep 2014 04:49:40 GMT
Message-Id: <201409080449.s884neYe021704@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 1198873 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
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: Mon, 08 Sep 2014 04:50:08 -0000

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

Change 1198873 by brooks@brooks_vica on 2014/08/18 17:31:06

	Use LIBADD to add support for linking the IR from libraries into
	programs so we can instrument more of the program with SOAAP.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.libnames.mk#6 edit
.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#19 edit
.. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#20 edit

Differences ...

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

@@ -180,3 +180,7 @@
 
 DPADD+=	${LIBADD:@L@${LIB${L:tu}:U"No LIB${L:tu} variable defined"}@}
 LDADD+=	${LIBADD:@L@${MINUSL${L:tu}:U${L:S/^/-l/}}@}
+.if ${MK_LLVM_INSTRUMENTED} != "no"
+LLVM_LINK_ADD+=	${LIBADD:@L@${LLVM_IR_FILE_${L:tu}:U"No LLVM_IR_FILE_${L:tu} variable defined"}@}
+LLVM_LDADD+=	${LIBADD:@L@${LLVM_IR_FILE_${L:tu}:U"No LLVM_NATIVE_FILE_${L:tu} variable defined"}@}
+.endif

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

@@ -80,12 +80,12 @@
 ${PROG}: beforelinking
 .endif
 
-${PROG}.${LLVM_IR_TYPE}-a: ${OIRS}
+${PROG}.${LLVM_IR_TYPE}-a: ${OIRS} ${LLVM_LINK_ADD}
 	@echo linking ${.TARGET}
 	@if [ -z "${OIRS}" ]; then \
 		touch ${.TARGET} ;\
 	else \
-		${LLVM_LINK} -o ${.TARGET} ${OIRS} ;\
+		${LLVM_LINK} -o ${.TARGET} ${OIRS} ${LLVM_LINK_ADD} ;\
 	fi
 
 ${PROG}: ${OBJS}

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

@@ -309,7 +309,7 @@
 
 .po_cep.soaap_cg:
 	${CC} ${.IMPSRC} -L${SOAAP_LIB_DIR} -L${LLVM_BUILD_DIR}/lib \
-	    -lcep_rt -lprofile_rt ${LDADD} -o ${.TARGET}
+	    -lcep_rt -lprofile_rt ${LDADD} ${LLVM_LDADD} -o ${.TARGET}
 
 .${LLVM_IR_TYPE}-a.bc_soaap_perf:
 	${OPT} -load ${SOAAP_LIB_DIR}/libsoaap.so -soaap \
@@ -319,7 +319,7 @@
 	${LLC} -filetype=obj -o ${.TARGET} ${.IMPSRC}
 
 .po_soaap_perf.soaap_perf:
-	${CC} ${.IMPSRC} ${LDADD} -o ${.TARGET}
+	${CC} ${.IMPSRC} ${LDADD} ${LLVM_LDADD} -o ${.TARGET}
 
 .${LLVM_IR_TYPE}-a.ao:
 	${LLC} -filetype=obj -o ${.TARGET} ${.IMPSRC}