about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorhexcoder- <heiko@hexco.de>2021-02-13 13:32:42 +0100
committerhexcoder- <heiko@hexco.de>2021-02-13 13:32:42 +0100
commit70651d60bdc5c70a8a699e0873a4726e1347a7c3 (patch)
tree898468927bb1bc06ccceaa763cf44fc333ab3ccc /src
parent385312c65858695b55607ccd376fb5ea8f83a688 (diff)
parent87a607c7d081dac1e4afd7c3cbe5accf62d355e4 (diff)
downloadafl++-70651d60bdc5c70a8a699e0873a4726e1347a7c3.tar.gz
Merge branch 'dev' of https://github.com/AFLplusplus/AFLplusplus into dev
Diffstat (limited to 'src')
-rw-r--r--src/afl-cc.c5
-rw-r--r--src/afl-fuzz-redqueen.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/afl-cc.c b/src/afl-cc.c
index 0ae401e7..9d88f262 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -554,6 +554,11 @@ static void edit_params(u32 argc, char **argv, char **envp) {
 
     }
 
+#if LLVM_MAJOR >= 13
+    // fuck you llvm 13
+    cc_params[cc_par_cnt++] = "-fno-experimental-new-pass-manager";
+#endif
+
     if (lto_mode && !have_c) {
 
       u8 *ld_path = strdup(AFL_REAL_LD);
diff --git a/src/afl-fuzz-redqueen.c b/src/afl-fuzz-redqueen.c
index 7844eedf..3ce4148d 100644
--- a/src/afl-fuzz-redqueen.c
+++ b/src/afl-fuzz-redqueen.c
@@ -1303,7 +1303,7 @@ static u8 cmp_extend_encoding(afl_state_t *afl, struct cmp_header *h,
 
   }
 
-#endif                                         /* CMPLOG_SOLVE_ARITHMETIC */
+#endif                                           /* CMPLOG_SOLVE_ARITHMETIC */
 
   return 0;
 
@@ -2670,3 +2670,4 @@ exit_its:
   return r;
 
 }
+