PERFORCE change 1198873 for review

[Brooks Davis]

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

Change 1198873 by brooks at 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}