From 585ba4c1dda6d8706db122e15718b867fd5489cd Mon Sep 17 00:00:00 2001 From: van Hauser Date: Sun, 8 Nov 2020 16:33:25 +0100 Subject: fix for llvm 10.0.0 --- src/afl-cc.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/afl-cc.c') 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 */ -- cgit 1.4.1 From 82d1c3e18dd1b90fa15f7c056f94dc1a06ee345d Mon Sep 17 00:00:00 2001 From: van Hauser Date: Sun, 8 Nov 2020 17:08:30 +0100 Subject: fix wrong llvm version comparison --- src/afl-cc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/afl-cc.c') diff --git a/src/afl-cc.c b/src/afl-cc.c index a1c1d676..771a58f5 100644 --- a/src/afl-cc.c +++ b/src/afl-cc.c @@ -507,7 +507,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { if (instrument_mode == INSTRUMENT_PCGUARD) { -#if LLVM_MAJOR >= 10 || (LLVM_MAJOR == 10 && LLVM_MINOR > 0) +#if LLVM_MAJOR > 10 || (LLVM_MAJOR == 10 && LLVM_MINOR > 0) cc_params[cc_par_cnt++] = "-Xclang"; cc_params[cc_par_cnt++] = "-load"; cc_params[cc_par_cnt++] = "-Xclang"; -- cgit 1.4.1