diff options
| -rw-r--r-- | gcc_plugin/afl-gcc-rt.o.c | 2 | ||||
| -rw-r--r-- | include/afl-as.h | 1 | ||||
| -rw-r--r-- | llvm_mode/Makefile | 11 | ||||
| -rw-r--r-- | llvm_mode/afl-llvm-rt.o.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/gcc_plugin/afl-gcc-rt.o.c b/gcc_plugin/afl-gcc-rt.o.c index 356d0b6d..508d4441 100644 --- a/gcc_plugin/afl-gcc-rt.o.c +++ b/gcc_plugin/afl-gcc-rt.o.c @@ -48,8 +48,10 @@ u8 *__afl_area_ptr = __afl_area_initial; #ifdef __ANDROID__ u32 __afl_prev_loc; +u32 __afl_final_loc; #else __thread u32 __afl_prev_loc; +__thread u32 __afl_final_loc; #endif /* Trace a basic block with some ID */ diff --git a/include/afl-as.h b/include/afl-as.h index de9fb646..3c44a437 100644 --- a/include/afl-as.h +++ b/include/afl-as.h @@ -384,6 +384,7 @@ static const u8* main_payload_32 = #ifndef COVERAGE_ONLY " .comm __afl_prev_loc, 4, 32\n" #endif /* !COVERAGE_ONLY */ + " .comm __afl_final_loc, 4, 32\n" " .comm __afl_fork_pid, 4, 32\n" " .comm __afl_temp, 4, 32\n" "\n" diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile index db0af84c..ff20c516 100644 --- a/llvm_mode/Makefile +++ b/llvm_mode/Makefile @@ -65,8 +65,9 @@ ifeq "$(LLVM_APPLE)" "1" $(warning llvm_mode will not compile with Xcode clang...) endif -CFLAGS ?= -O3 -funroll-loops -CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign -I ../include/ \ +CFLAGS ?= -O3 -funroll-loops +override CFLAGS = -Wall \ + -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign -I ../include/ \ -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \ -DLLVM_BINDIR=\"$(LLVM_BINDIR)\" -DVERSION=\"$(VERSION)\" \ -DLLVM_VERSION=\"$(LLVMVER)\" @@ -74,9 +75,9 @@ ifdef AFL_TRACE_PC CFLAGS += -DUSE_TRACE_PC=1 endif -CXXFLAGS ?= -O3 -funroll-loops -CXXFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -I ../include/ \ - -DVERSION=\"$(VERSION)\" -Wno-variadic-macros +CXXFLAGS ?= -O3 -funroll-loops +override CXXFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -I ../include/ \ + -DVERSION=\"$(VERSION)\" -Wno-variadic-macros CLANG_CFL = `$(LLVM_CONFIG) --cxxflags` -Wl,-znodelete -fno-rtti -fpic $(CXXFLAGS) CLANG_LFL = `$(LLVM_CONFIG) --ldflags` $(LDFLAGS) diff --git a/llvm_mode/afl-llvm-rt.o.c b/llvm_mode/afl-llvm-rt.o.c index 320b3d96..488be3fc 100644 --- a/llvm_mode/afl-llvm-rt.o.c +++ b/llvm_mode/afl-llvm-rt.o.c @@ -63,8 +63,10 @@ u8* __afl_area_ptr = __afl_area_initial; #ifdef __ANDROID__ u32 __afl_prev_loc; +u32 __afl_final_loc; #else __thread u32 __afl_prev_loc; +__thread u32 __afl_final_loc; #endif struct cmp_map* __afl_cmp_map; |