diff options
| author | van Hauser <vh@thc.org> | 2020-11-08 16:33:25 +0100 |
|---|---|---|
| committer | van Hauser <vh@thc.org> | 2020-11-08 16:33:25 +0100 |
| commit | 585ba4c1dda6d8706db122e15718b867fd5489cd (patch) | |
| tree | 58f0a4f6930ad8a6c1885e0ec62741112fd9b5c9 | |
| parent | a728e8f9a5518017cde12bdb6ba795a6bcb47b0a (diff) | |
| download | afl++-585ba4c1dda6d8706db122e15718b867fd5489cd.tar.gz | |
fix for llvm 10.0.0
| -rw-r--r-- | GNUmakefile.llvm | 2 | ||||
| -rw-r--r-- | src/afl-cc.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/GNUmakefile.llvm b/GNUmakefile.llvm index 2bb0263b..cc28695d 100644 --- a/GNUmakefile.llvm +++ b/GNUmakefile.llvm @@ -357,7 +357,7 @@ instrumentation/afl-common.o: ./src/afl-common.c $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ $(LDFLAGS) ./afl-cc: src/afl-cc.c instrumentation/afl-common.o - $(CC) $(CLANG_CFL) $(CFLAGS) $(CPPFLAGS) $< instrumentation/afl-common.o -o $@ -DLLVM_MAJOR=$(LLVM_MAJOR) $(LDFLAGS) -DCFLAGS_OPT=\"$(CFLAGS_OPT)\" + $(CC) $(CLANG_CFL) $(CFLAGS) $(CPPFLAGS) $< instrumentation/afl-common.o -o $@ -DLLVM_MINOR=$(LLVM_MINOR) -DLLVM_MAJOR=$(LLVM_MAJOR) $(LDFLAGS) -DCFLAGS_OPT=\"$(CFLAGS_OPT)\" @ln -sf afl-cc ./afl-c++ @ln -sf afl-cc ./afl-gcc @ln -sf afl-cc ./afl-g++ diff --git a/src/afl-cc.c b/src/afl-cc.c index 46468dda..a1c1d676 100644 --- a/src/afl-cc.c +++ b/src/afl-cc.c @@ -38,6 +38,12 @@ #if !defined(LLVM_MAJOR) #define LLVM_MAJOR 0 #endif +#if (LLVM_MINOR - 0 == 0) + #undef LLVM_MINOR +#endif +#if !defined(LLVM_MINOR) + #define LLVM_MINOR 0 +#endif static u8 * obj_path; /* Path to runtime libraries */ static u8 **cc_params; /* Parameters passed to the real CC */ |