From owner-p4-projects@FreeBSD.ORG Tue Aug 27 15:00:02 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B4003FF; Tue, 27 Aug 2013 15:00:02 +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 5DE143FD for ; Tue, 27 Aug 2013 15:00:02 +0000 (UTC) (envelope-from brooks@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 3BE882D94 for ; Tue, 27 Aug 2013 15:00:02 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r7RF022W004084 for ; Tue, 27 Aug 2013 15:00:02 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r7RF02Ln004081 for perforce@freebsd.org; Tue, 27 Aug 2013 15:00:02 GMT (envelope-from brooks@freebsd.org) Date: Tue, 27 Aug 2013 15:00:02 GMT Message-Id: <201308271500.r7RF02Ln004081@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 480958 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Aug 2013 15:00:03 -0000 http://p4web.freebsd.org/@@480958?ac=10 Change 480958 by brooks@brooks_zenith on 2013/08/27 14:59:45 More firmly disable aic, ahc, and ahd. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/conf/files#11 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/conf/files#11 (text+ko) ==== @@ -9,45 +9,45 @@ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ no-obj no-implicit-rule before-depend \ clean "acpi_quirks.h" -aicasm optional ahc | ahd \ +#aicasm optional ahc | ahd \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC='${CC}' ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" -aic7xxx_seq.h optional ahc \ +#aic7xxx_seq.h optional ahc \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ no-obj no-implicit-rule before-depend local \ clean "aic7xxx_seq.h" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -aic7xxx_reg.h optional ahc \ +#aic7xxx_reg.h optional ahc \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ no-obj no-implicit-rule before-depend local \ clean "aic7xxx_reg.h" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -aic7xxx_reg_print.c optional ahc \ +#aic7xxx_reg_print.c optional ahc \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ no-obj no-implicit-rule local \ clean "aic7xxx_reg_print.c" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -aic7xxx_reg_print.o optional ahc ahc_reg_pretty_print \ +#aic7xxx_reg_print.o optional ahc ahc_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local -aic79xx_seq.h optional ahd pci \ +#aic79xx_seq.h optional ahd pci \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ no-obj no-implicit-rule before-depend local \ clean "aic79xx_seq.h" \ dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -aic79xx_reg.h optional ahd pci \ +#aic79xx_reg.h optional ahd pci \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ no-obj no-implicit-rule before-depend local \ clean "aic79xx_reg.h" \ dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -aic79xx_reg_print.c optional ahd pci \ +#aic79xx_reg_print.c optional ahd pci \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ no-obj no-implicit-rule local \ clean "aic79xx_reg_print.c" \ dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ +#aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local # @@ -652,22 +652,22 @@ dev/ahb/ahb.c optional ahb eisa dev/ahci/ahci.c optional ahci pci dev/ahci/ahciem.c optional ahci pci -dev/aic/aic.c optional aic -dev/aic/aic_pccard.c optional aic pccard -dev/aic7xxx/ahc_eisa.c optional ahc eisa -dev/aic7xxx/ahc_isa.c optional ahc isa -dev/aic7xxx/ahc_pci.c optional ahc pci \ - compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}" -dev/aic7xxx/ahd_pci.c optional ahd pci \ - compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}" -dev/aic7xxx/aic7770.c optional ahc -dev/aic7xxx/aic79xx.c optional ahd pci -dev/aic7xxx/aic79xx_osm.c optional ahd pci -dev/aic7xxx/aic79xx_pci.c optional ahd pci -dev/aic7xxx/aic7xxx.c optional ahc -dev/aic7xxx/aic7xxx_93cx6.c optional ahc -dev/aic7xxx/aic7xxx_osm.c optional ahc -dev/aic7xxx/aic7xxx_pci.c optional ahc pci +#dev/aic/aic.c optional aic +#dev/aic/aic_pccard.c optional aic pccard +#dev/aic7xxx/ahc_eisa.c optional ahc eisa +#dev/aic7xxx/ahc_isa.c optional ahc isa +#dev/aic7xxx/ahc_pci.c optional ahc pci \ +# compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}" +#dev/aic7xxx/ahd_pci.c optional ahd pci \ +# compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}" +#dev/aic7xxx/aic7770.c optional ahc +#dev/aic7xxx/aic79xx.c optional ahd pci +#dev/aic7xxx/aic79xx_osm.c optional ahd pci +#dev/aic7xxx/aic79xx_pci.c optional ahd pci +#dev/aic7xxx/aic7xxx.c optional ahc +#dev/aic7xxx/aic7xxx_93cx6.c optional ahc +#dev/aic7xxx/aic7xxx_osm.c optional ahc +#dev/aic7xxx/aic7xxx_pci.c optional ahc pci dev/alc/if_alc.c optional alc pci dev/ale/if_ale.c optional ale pci dev/altera/avgen/altera_avgen.c optional altera_avgen From owner-p4-projects@FreeBSD.ORG Wed Aug 28 09:53:11 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1535C8B9; Wed, 28 Aug 2013 09:53:11 +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 CCE898B7 for ; Wed, 28 Aug 2013 09:53:10 +0000 (UTC) (envelope-from brooks@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 B80D629F6 for ; Wed, 28 Aug 2013 09:53:10 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r7S9rAhs021135 for ; Wed, 28 Aug 2013 09:53:10 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r7S9rArg021132 for perforce@freebsd.org; Wed, 28 Aug 2013 09:53:10 GMT (envelope-from brooks@freebsd.org) Date: Wed, 28 Aug 2013 09:53:10 GMT Message-Id: <201308280953.r7S9rArg021132@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 490999 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Aug 2013 09:53:11 -0000 http://p4web.freebsd.org/@@490999?ac=10 Change 490999 by brooks@brooks_zenith on 2013/08/28 09:52:09 Don't do LLVM instrumentation when EARLY_BUILD is defined as it is when building aicasm. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#10 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#10 (text+ko) ==== @@ -54,7 +54,8 @@ .if defined(SRCS) && !empty(SRCS) # XXX: currently tesla can't handle C++ so build C++ code normaly in the # WITH_TESLA case. -.if defined(NO_LLVM_IR) || ${MK_LLVM_INSTRUMENTED} == "no" || \ +.if defined(EARLY_BUILD) || defined(NO_LLVM_IR) || \ + ${MK_LLVM_INSTRUMENTED} == "no" || \ (${MK_TESLA} != "no" && defined(PROG_CXX)) OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .else @@ -89,7 +90,7 @@ .endif .endif -.if ${MK_TESLA} != "no" +.if ${MK_TESLA} != "no" && !defined(EARLY_BUILD) tesla.manifest: ${TESLA_FILES} cat ${TESLA_FILES} > ${.TARGET} From owner-p4-projects@FreeBSD.ORG Wed Aug 28 09:54:12 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 807AA9C2; Wed, 28 Aug 2013 09:54:12 +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 2A6879C0 for ; Wed, 28 Aug 2013 09:54:12 +0000 (UTC) (envelope-from brooks@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 162C72A06 for ; Wed, 28 Aug 2013 09:54:12 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r7S9sBkx023220 for ; Wed, 28 Aug 2013 09:54:11 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r7S9sBRN023217 for perforce@freebsd.org; Wed, 28 Aug 2013 09:54:11 GMT (envelope-from brooks@freebsd.org) Date: Wed, 28 Aug 2013 09:54:11 GMT Message-Id: <201308280954.r7S9sBRN023217@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 491016 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Aug 2013 09:54:12 -0000 http://p4web.freebsd.org/@@491016?ac=10 Change 491016 by brooks@brooks_zenith on 2013/08/28 09:53:48 Revert 480958 it was wrong and didn't work. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/conf/files#12 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/conf/files#12 (text+ko) ==== @@ -9,45 +9,45 @@ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ no-obj no-implicit-rule before-depend \ clean "acpi_quirks.h" -#aicasm optional ahc | ahd \ +aicasm optional ahc | ahd \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC='${CC}' ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" -#aic7xxx_seq.h optional ahc \ +aic7xxx_seq.h optional ahc \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ no-obj no-implicit-rule before-depend local \ clean "aic7xxx_seq.h" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -#aic7xxx_reg.h optional ahc \ +aic7xxx_reg.h optional ahc \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ no-obj no-implicit-rule before-depend local \ clean "aic7xxx_reg.h" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -#aic7xxx_reg_print.c optional ahc \ +aic7xxx_reg_print.c optional ahc \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ no-obj no-implicit-rule local \ clean "aic7xxx_reg_print.c" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -#aic7xxx_reg_print.o optional ahc ahc_reg_pretty_print \ +aic7xxx_reg_print.o optional ahc ahc_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local -#aic79xx_seq.h optional ahd pci \ +aic79xx_seq.h optional ahd pci \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ no-obj no-implicit-rule before-depend local \ clean "aic79xx_seq.h" \ dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -#aic79xx_reg.h optional ahd pci \ +aic79xx_reg.h optional ahd pci \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ no-obj no-implicit-rule before-depend local \ clean "aic79xx_reg.h" \ dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -#aic79xx_reg_print.c optional ahd pci \ +aic79xx_reg_print.c optional ahd pci \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ no-obj no-implicit-rule local \ clean "aic79xx_reg_print.c" \ dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -#aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ +aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local # From owner-p4-projects@FreeBSD.ORG Wed Aug 28 22:20:28 2013 Return-Path: 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 ; 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 ; 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 ; 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 Subject: PERFORCE change 497537 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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