fix conflicts when merging map-ptr branch to master branch

This commit is contained in:
Nguyen Anh Quynh
2015-12-17 08:12:02 +08:00
57 changed files with 3907 additions and 54 deletions

View File

@ -4,7 +4,7 @@ CFLAGS += -L ../../
CFLAGS += -lcmocka -lunicorn
CFLAGS += -I ../../include
ALL_TESTS = test_sanity test_x86 test_mem_map test_mem_map_ptr
ALL_TESTS = test_sanity test_x86 test_mem_map test_mem_high test_mem_map_ptr
.PHONY: all
all: ${ALL_TESTS}
@ -24,6 +24,7 @@ test_sanity: test_sanity.c
test_x86: test_x86.c
test_mem_map: test_mem_map.c
test_mem_map_ptr: test_mem_map_ptr.c
test_mem_high: test_mem_high.c
${ALL_TESTS}:
gcc ${CFLAGS} -o $@ $^