PERFORCE change 1202708 for review

[Khilan Gudka]

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

Change 1202708 by novazeta at 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}