about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNikita Popov <npopov@redhat.com>2022-09-14 11:34:29 +0200
committerNikita Popov <npopov@redhat.com>2022-09-14 15:54:29 +0200
commitb27a4a3689983390bbfc48c1bd1ba04e1b1aa935 (patch)
treeccf29ecb14af9315092123e18b81c8e4eea5719b /src
parent5452d4652b14bbb311057bb09b0345669491bfac (diff)
downloadafl++-b27a4a3689983390bbfc48c1bd1ba04e1b1aa935.tar.gz
Fix loading and registeration of LTO pass for new pass manager
Diffstat (limited to 'src')
-rw-r--r--src/afl-cc.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/afl-cc.c b/src/afl-cc.c
index c0449e64..5e7a9c9e 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -666,15 +666,21 @@ static void edit_params(u32 argc, char **argv, char **envp) {
 #endif
       free(ld_path);
 
-#if defined(AFL_CLANG_LDPATH) && LLVM_MAJOR >= 13
+#if defined(AFL_CLANG_LDPATH) && LLVM_MAJOR >= 15
+      // The NewPM implementation only works fully since LLVM 15.
+      cc_params[cc_par_cnt++] =
+          alloc_printf("-Wl,--load-pass-plugin=%s/SanitizerCoverageLTO.so", obj_path);
+#elif defined(AFL_CLANG_LDPATH) && LLVM_MAJOR >= 13
       cc_params[cc_par_cnt++] = "-Wl,--lto-legacy-pass-manager";
+      cc_params[cc_par_cnt++] =
+          alloc_printf("-Wl,-mllvm=-load=%s/SanitizerCoverageLTO.so", obj_path);
 #else
       cc_params[cc_par_cnt++] = "-fno-experimental-new-pass-manager";
+      cc_params[cc_par_cnt++] =
+          alloc_printf("-Wl,-mllvm=-load=%s/SanitizerCoverageLTO.so", obj_path);
 #endif
 
       cc_params[cc_par_cnt++] = "-Wl,--allow-multiple-definition";
-      cc_params[cc_par_cnt++] =
-          alloc_printf("-Wl,-mllvm=-load=%s/SanitizerCoverageLTO.so", obj_path);
       cc_params[cc_par_cnt++] = lto_flag;
 
     } else {