From 2a41a12e8063af2c7bd703957676123fb004fc97 Mon Sep 17 00:00:00 2001 From: bloodstalker Date: Sun, 5 Aug 2018 15:52:05 +0430 Subject: update --- resources/makefile | 94 ++++++++++++++++++++++++++++++++++++++++++++---------- resources/wasm.xml | 52 +++++++++++++++++++++++++++--- 2 files changed, 125 insertions(+), 21 deletions(-) (limited to 'resources') diff --git a/resources/makefile b/resources/makefile index 434dc68..944bfe1 100644 --- a/resources/makefile +++ b/resources/makefile @@ -1,28 +1,56 @@ -TARGET=XXX +TARGET=autowasm CC=clang CC?=clang CC_FLAGS=-fpic CC_EXTRA?= -CC_FLAGS+=$(CC_EXTRA) +CTAGS_I_PATH?=./ LD_FLAGS= EXTRA_LD_FLAGS?= -LD_FLAGS+=$(EXTRA_LD_FLAGS) ADD_SANITIZERS_CC= -g -fsanitize=address -fno-omit-frame-pointer ADD_SANITIZERS_LD= -g -fsanitize=address MEM_SANITIZERS_CC= -g -fsanitize=memory -fno-omit-frame-pointer MEM_SANITIZERS_LD= -g -fsanitize=memory -UB_SANITIZERS_CC= -g -fsanitize=undefined -fno-omit-frame-pointer -UB_SANITIZERS_LD= -g -fsanitize=undefined -BUILD_MODE?=COV_NO_CLANG_1Z +UB_SANITIZERS_CC= -g -fsanitize=undefined -fno-omit-frame-pointer +UB_SANITIZERS_LD= -g -fsanitize=undefined +# BUILD_MODES are=RELEASE(default), DEBUG,ADDSAN,MEMSAN,UBSAN +BUILD_MODE?=RELEASE + +ifeq ($(BUILD_MODE), ADDSAN) +ifeq ($(CC), gcc) +$(error This build mode is only useable with clang.) +endif +CC_EXTRA+=$(ADD_SANITIZERS_CC) +EXTRA_LD_FLAGS+=$(ADD_SANITIZERS_LD) +endif + +ifeq ($(BUILD_MODE), MEMSAN) +ifeq ($(CC), gcc) +$(error This build mode is only useable with clang.) +endif +CC_EXTRA+=$(MEM_SANITIZERS_CC) +EXTRA_LD_FLAGS+=$(MEM_SANITIZERS_LD) +endif -SRCS=$(wildcard *.c) +ifeq ($(BUILD_MODE), UBSAN) +ifeq ($(CC), gcc) +$(error This build mode is only useable with clang.) +endif +CC_EXTRA+=$(UB_SANITIZERS_CC) +EXTRA_LD_FLAGS+=$(UB_SANITIZERS_LD) +endif + +SRCS:=$(wildcard *.c) +CC_FLAGS+=$(CC_EXTRA) +LD_FLAGS+=$(EXTRA_LD_FLAGS) .DEFAULT:all -.PHONY:all clean help ASM SO +.PHONY:all clean help ASM SO TAGS all:$(TARGET) +everything:$(TARGET) A ASM SO $(TARGET)-static $(TARGET)-dbg TAGS + depend:.depend .depend:$(SRCS) @@ -32,27 +60,59 @@ depend:.depend -include ./.depend .c.o: - $(CC) $(CC_FLAGS) -c $< -o $@ + $(CC) $(CC_FLAGS) -c $< -o $@ -$(TARGET): $(TARGET).o read.o aggregate.o structs.o +%.odbg:%.c + $(CC) $(CC_FLAGS) -g -c $< -o $@ + +$(TARGET): $(TARGET).o read.o structs.o aggregate.o $(CC) $^ $(LD_FLAGS) -o $@ +$(TARGET)-static: $(TARGET).o read.o structs.o aggregate.o + $(CC) $^ $(LD_FLAGS) -static -o $@ + +$(TARGET)-dbg: $(TARGET).odbg read.odbg structs.odbg aggregate.odbg + $(CC) $^ $(LD_FLAGS) -g -o $@ + ASM:$(TARGET).asm SO:$(TARGET).so -$(TARGET).asm: $(TARGET).o +A:$(TARGET).a + +TAGS:tags + +tags:$(SRCS) + $(shell $(CC) -c -I $(CTAGS_I_PATH) -M $(SRCS)|\ + sed -e 's/[\\ ]/\n/g'|sed -e '/^$$/d' -e '/\.o:[ \t]*$$/d'|\ + ctags -L - --c++-kinds=+p --fields=+iaS --extra=+q) + +$(TARGET).asm: $(TARGET).o read.o structs.o aggregate.o objdump -r -d -M intel -S $(TARGET).o > $(TARGET).asm -$(TARGET).so: $(TARGET).o +$(TARGET).so: $(TARGET).o read.o structs.o aggregate.o $(CC) $^ $(LD_FLAGS) -shared -o $@ +$(TARGET).a: $(TARGET).o read.o structs.o aggregate.o + ar rcs $(TARGET).a $(TARGET).o + clean: - rm -f *.o *~ $(TARGET) $(TARGET).so $(TARGET).asm + rm -f *.o *.odbg *~ $(TARGET) $(TARGET).so $(TARGET).asm $(TARGET)-static $(TARGET)-dbg $(TARGET).a + +deepclean: + rm -f *.o *.odbg *~ $(TARGET) $(TARGET).so $(TARGET).asm tags $(TARGET)-static $(TARGET)-dbg $(TARGET).a rm .depend help: - @echo "all is the default target" - @echo "SO will generate the so" - @echo "ASM will generate assembly files" - @echo "clean" + @echo "--all is the default target, runs $(TARGET) target" + @echo "--everything will build everything" + @echo "--SO will generate the so" + @echo "--ASM will generate assembly files" + @echo "--TAGS will generate tags file" + @echo "--$(TARGET) builds the dynamically-linked executable" + @echo "--$(TARGET)-dbg will generate the debug build. BUILD_MODE should be set to DEBUG to work" + @echo "--$(TARGET)-static will statically link the executable to the libraries" + @echo "--A will build the static library" + @echo "--TAGS will build the tags file" + @echo "--clean" + @echo "--deepclean will clean almost everything" diff --git a/resources/wasm.xml b/resources/wasm.xml index c174429..6a9dfe9 100644 --- a/resources/wasm.xml +++ b/resources/wasm.xml @@ -4,45 +4,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -69,11 +113,11 @@ -
- - + + + - + -- cgit v1.2.3