From f6bc233e8398faaa4f64adf13d816d58ffbfd082 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Thu, 6 Aug 2020 15:24:06 -0400 Subject: [PATCH] chore: change sledge prefix --- runtime/tests/Makefile | 4 ++-- runtime/tests/Makefile.inc | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runtime/tests/Makefile b/runtime/tests/Makefile index 32d2c82..e4b03af 100644 --- a/runtime/tests/Makefile +++ b/runtime/tests/Makefile @@ -25,7 +25,7 @@ clean: ${AWSM_EXECUTABLE} ${TMP_DIR}/$(@:%_rt=%).wasm -o ${TMP_DIR}/$(@:%_rt=%).bc ${CC} ${CFLAGS} ${OPTFLAGS} -D${USE_MEM} -D${ARCH} ${TMP_DIR}/$(@:%_rt=%).bc ${AWSM_MEMC} ${AWSM_RT_LIBC} ${AWSM_RT_ENV} ${AWSM_RT_RT} -lm -o ${TMP_DIR}/$(@:%_rt=%)_wasm.out ${AWSM_EXECUTABLE} --inline-constant-globals --runtime-globals ${TMP_DIR}/$(@:%_rt=%).wasm -o ${TMP_DIR}/$(@:%_rt=%).bc - ${CC} --shared -fPIC ${OPTFLAGS} -I${SERVERLESS_RT_INC} -D${USE_MEM} ${TMP_DIR}/$(@:%_rt=%).bc ${SERVERLESS_MEMC} ${SERVERLESS_WASMISA} -o ${TMP_DIR}/$(@:%_rt=%)_wasm.so - @cp ${TMP_DIR}/$(@:%_rt=%)_wasm.so ${SERVERLESS_BIN_DIR} + ${CC} --shared -fPIC ${OPTFLAGS} -I${SLEDGE_RT_INC} -D${USE_MEM} ${TMP_DIR}/$(@:%_rt=%).bc ${SLEDGE_MEMC} ${SLEDGE_WASMISA} -o ${TMP_DIR}/$(@:%_rt=%)_wasm.so + @cp ${TMP_DIR}/$(@:%_rt=%)_wasm.so ${SLEDGE_BIN_DIR} # @rm -rf ${TMP_DIR} diff --git a/runtime/tests/Makefile.inc b/runtime/tests/Makefile.inc index b2ba2c4..f33bcec 100644 --- a/runtime/tests/Makefile.inc +++ b/runtime/tests/Makefile.inc @@ -32,14 +32,14 @@ AWSM_MEMC=${AWSM_RT_MEM}/${MEMC_64} AWSM_DUMMY=${AWSM_BASE_DIR}/code_benches/dummy.c # for SLEdge -SERVERLESS_BASE_DIR=../../ -SERVERLESS_RT_DIR=${SERVERLESS_BASE_DIR}/runtime/ -SERVERLESS_RT_INC=${SERVERLESS_RT_DIR}/include/ -SERVERLESS_BIN_DIR=${SERVERLESS_RT_DIR}/bin/ -SERVERLESS_WASMISA=${SERVERLESS_RT_DIR}/compiletime/instr.c +SLEDGE_BASE_DIR=../../ +SLEDGE_RT_DIR=${SLEDGE_BASE_DIR}/runtime/ +SLEDGE_RT_INC=${SLEDGE_RT_DIR}/include/ +SLEDGE_BIN_DIR=${SLEDGE_RT_DIR}/bin/ +SLEDGE_WASMISA=${SLEDGE_RT_DIR}/compiletime/instr.c USE_MEM=USE_MEM_VM ifeq ($(USE_MEM),USE_MEM_VM) -SERVERLESS_MEMC=${SERVERLESS_RT_DIR}/compiletime/memory/${MEMC_64} +SLEDGE_MEMC=${SLEDGE_RT_DIR}/compiletime/memory/${MEMC_64} endif