From 9389b702ba7502ccf9fb0674bc5ab7e02ad0227a Mon Sep 17 00:00:00 2001
From: "Tate, Hongliang Tian" <tatetian@gmail.com>
Date: Wed, 26 Dec 2018 22:03:14 +0800
Subject: [PATCH] Use Occlum toolchain to compile test programs

---
 test/test_common.mk | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/test_common.mk b/test/test_common.mk
index 94eaef1e..8c94d41a 100644
--- a/test/test_common.mk
+++ b/test/test_common.mk
@@ -3,7 +3,7 @@ INCLUDE_MAKEFILE := $(lastword $(MAKEFILE_LIST))
 CUR_DIR := $(shell dirname $(realpath $(MAIN_MAKEFILE)))
 PROJECT_DIR := $(realpath $(CUR_DIR)/../../)
 
-CC := /usr/local/occlum/bin/musl-gcc
+CC := /usr/local/occlum/bin/musl-clang
 C_SRCS := $(wildcard *.c)
 S_FILES := $(C_SRCS:%.c=%.S)
 C_OBJS := $(C_SRCS:%.c=%.o)
@@ -12,8 +12,9 @@ BIN_ENC_NAME := bin.encrypted
 OBJDUMP_FILE := bin.objdump
 READELF_FILE := bin.readelf
 
-C_FLAGS = -Wall -fverbose-asm -O0 $(EXTRA_C_FLAGS)
-LINK_FLAGS = $(EXTRA_LINK_FLAGS)
+C_FLAGS = -Wall -O0 $(EXTRA_C_FLAGS)
+C_FLAGS += -Xclang -load -Xclang $(LLVM_PATH)/lib/LLVMBoundchecker.so -mllvm -check-store-only=true
+LINK_FLAGS = $(C_FLAGS) $(EXTRA_LINK_FLAGS)
 
 .PHONY: all run debug clean
 
@@ -39,12 +40,9 @@ $(READELF_FILE): $(BIN_NAME)
 $(BIN_NAME): $(C_OBJS)
 	$(CC) $^ $(LINK_FLAGS) -o $(BIN_NAME)
 
-$(C_OBJS): %.o: %.S
+$(C_OBJS): %.o: %.c
 	$(CC) $(C_FLAGS) -c $< -o $@
 
-$(S_FILES): %.S: %.c
-	$(CC) $(C_FLAGS) -S $< -o $@
-
 #############################################################################
 # Test
 #############################################################################