From owner-p4-projects@FreeBSD.ORG Tue Nov 11 11:01:52 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D167F6D4; Tue, 11 Nov 2014 11:01:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92E956D2 for ; Tue, 11 Nov 2014 11:01:52 +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 6596F997 for ; Tue, 11 Nov 2014 11:01:52 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sABB1q6w000442 for ; Tue, 11 Nov 2014 11:01:52 GMT (envelope-from novazeta@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sABB1qDa000439 for perforce@freebsd.org; Tue, 11 Nov 2014 11:01:52 GMT (envelope-from novazeta@FreeBSD.org) Date: Tue, 11 Nov 2014 11:01:52 GMT Message-Id: <201411111101.sABB1qDa000439@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to novazeta@FreeBSD.org using -f From: Khilan Gudka Subject: PERFORCE change 1202708 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 11:01:53 -0000 http://p4web.freebsd.org/@@1202708?ac=10 Change 1202708 by novazeta@novazeta_vica on 2014/11/11 11:01:24 Update SOAAP bits of build system Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#17 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#21 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#17 (text+ko) ==== @@ -647,21 +647,15 @@ .endif .if ${MK_SOAAP} != "no" -.if !defined(SOAAP_INCLUDE_DIR) .if !defined(SOAAP_SOURCE_DIR) -.error Must set one of SOAAP_INCLUDE_DIR or SOAAP_SOURCE_DIR with WITH_SOAAP +.error Must set SOAAP_SOURCE_DIR with WITH_SOAAP .else -.warning SOAAP_SOURCE_DIR is deprecated, use SOAAP_INCLUDE_DIR SOAAP_INCLUDE_DIR=${SOAAP_SOURCE_DIR}/include .endif -.endif -.if !defined(SOAAP_LIB_DIR) .if !defined(SOAAP_BUILD_DIR) -.error Must set one of SOAAP_LIB_DIR or SOAAP_BUILD_DIR with WITH_SOAAP +.error Must set SOAAP_BUILD_DIR with WITH_SOAAP .else -.warning SOAAP_BUILD_DIR is deprecated, use SOAAP_LIB_DIR -SOAAP_LIB_DIR=${SOAAP_BUILD_DIR} -.endif +SOAAP=${SOAAP_BUILD_DIR}/bin/soaap .endif CFLAGS+= -g -DSOAAP -I${SOAAP_INCLUDE_DIR} .if defined(WITHOUT_LLVM_INSTRUMENTED) ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#21 (text+ko) ==== @@ -298,22 +298,10 @@ .endif .${LLVM_IR_TYPE}-a.soaap: - ${SOAAP} ${SOAAP_FLAGS} -o /dev/null ${.IMPSRC} - -.${LLVM_IR_TYPE}-a.bc_cep: - ${OPT} -load ${SOAAP_LIB_DIR}/libcep.so -insert-call-edge-profiling \ - -o ${.TARGET} ${.IMPSRC} - -.bc_cep.po_cep: - ${LLC} -filetype=obj ${LLCFLAGS} -o ${.TARGET} ${.IMPSRC} - -.po_cep.soaap_cg: - ${CC} ${.IMPSRC} -L${SOAAP_LIB_DIR} -L${LLVM_BUILD_DIR}/lib \ - -lcep_rt -lprofile_rt ${LDADD} ${LLVM_LDADD} -o ${.TARGET} + ${SOAAP} ${SOAAP_FLAGS} ${.IMPSRC} .${LLVM_IR_TYPE}-a.bc_soaap_perf: - ${OPT} -load ${SOAAP_LIB_DIR}/libsoaap.so -soaap \ - -soaap-emulate-performance ${SOAAP_FLAGS} -o ${.TARGET} ${.IMPSRC} + ${SOAAP} --soaap-emulate-performance ${SOAAP_FLAGS} -o ${.TARGET} ${.IMPSRC} .bc_soaap_perf.po_soaap_perf: ${LLC} -filetype=obj -o ${.TARGET} ${.IMPSRC}