From 8491837870b51210f156182c9f942f370e0735e9 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Mon, 5 Apr 2021 15:05:54 -0400 Subject: [PATCH] fix: Update tinyekf build --- runtime/tests/Makefile | 6 ++---- runtime/tests/TinyEKF | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/runtime/tests/Makefile b/runtime/tests/Makefile index 6103e11..78482a8 100644 --- a/runtime/tests/Makefile +++ b/runtime/tests/Makefile @@ -16,8 +16,8 @@ clean: @rm -rf ${SLEDGE_BIN_DIR}/*_wasm.so tinyekf: - make clean all -C ./TinyEKF/extras/c/ -f makefile.wasm - cp ./TinyEKF/extras/c/gps_ekf_fn.aso ${SLEDGE_BIN_DIR}/ekf_wasm.so + make clean gps_ekf_fn.so -C ./TinyEKF/extras/c/ -f MakefileWasm + cp ./TinyEKF/extras/c/gps_ekf_fn.so ${SLEDGE_BIN_DIR}/ekf_wasm.so cifar10: make clean all -C ./CMSIS_5_NN/ -f Makefile @@ -37,8 +37,6 @@ sod: @echo "Compiling $(@:%_rt=%)" ${WASMCC} ${$(@:%_rt=%)_CFLAGS} ${WASMCFLAGS} ${OPTFLAGS} $(@:%_rt=%)/*.c $(AWSM_DUMMY) -o ${TMP_DIR}/$(@:%_rt=%).wasm ${AWSM_NAME} ${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_NAME} --inline-constant-globals --runtime-globals ${TMP_DIR}/$(@:%_rt=%).wasm -o ${TMP_DIR}/$(@:%_rt=%).bc ${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/TinyEKF b/runtime/tests/TinyEKF index fe59ef0..41b2e01 160000 --- a/runtime/tests/TinyEKF +++ b/runtime/tests/TinyEKF @@ -1 +1 @@ -Subproject commit fe59ef0e551746aee4d007e4516321bfbe65fe74 +Subproject commit 41b2e01e29ba060a33dbd8552963d378a3bde1ec