Date: Wed, 28 Aug 2013 22:20:27 GMT From: Khilan Gudka <novazeta@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 497537 for review Message-ID: <201308282220.r7SMKRNV094926@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308282220.r7SMKRNV094926>