about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--TODO_LLVM10
-rw-r--r--docs/env_variables.md7
-rw-r--r--instrumentation/compare-transform-pass.so.cc2
3 files changed, 8 insertions, 11 deletions
diff --git a/TODO_LLVM b/TODO_LLVM
deleted file mode 100644
index 3dea8cca..00000000
--- a/TODO_LLVM
+++ /dev/null
@@ -1,10 +0,0 @@
-with LLVM 14: only new pass manager
-up to LLVM 13: only old pass manager
-
-These do not work yet with the new pass manager:
-cmplog-instructions-pass.so
-compare-transform-pass.so
-afl-llvm-dict2file.so
-afl-llvm-lto-instrumentlist.so
-SanitizerCoverageLTO.so
-SanitizerCoveragePCGUARD.so
diff --git a/docs/env_variables.md b/docs/env_variables.md
index 4626a9b6..edd57fb6 100644
--- a/docs/env_variables.md
+++ b/docs/env_variables.md
@@ -518,7 +518,12 @@ checks or alter some of the more exotic semantics of the tool:
     the target binary. Example: `AFL_TARGET_ENV="VAR1=1 VAR2='a b c'" afl-fuzz
     ... `. This exists mostly for things like `LD_LIBRARY_PATH` but it would
     theoretically allow fuzzing of AFL++ itself (with 'target' AFL++ using some
-    AFL_ vars that would disrupt work of 'fuzzer' AFL++).
+    AFL_ vars that would disrupt work of 'fuzzer' AFL++). Note that when using
+    QEMU mode, the `AFL_TARGET_ENV` environment variables will apply to QEMU, as
+    well as the target binary. Therefore, in this case, you might want to use
+    QEMU's `QEMU_SET_ENV` environment variable (see QEMU's documentation because
+    the format is different from `AFL_TARGET_ENV`) to apply the environment
+    variables to the target and not QEMU.
 
   - `AFL_TESTCACHE_SIZE` allows you to override the size of `#define
     TESTCASE_CACHE` in config.h. Recommended values are 50-250MB - or more if
diff --git a/instrumentation/compare-transform-pass.so.cc b/instrumentation/compare-transform-pass.so.cc
index be4dd513..cd3f0e6f 100644
--- a/instrumentation/compare-transform-pass.so.cc
+++ b/instrumentation/compare-transform-pass.so.cc
@@ -80,12 +80,14 @@ class CompareTransform : public ModulePass {
 
   }
 
+#if LLVM_MAJOR < 11
 #if LLVM_VERSION_MAJOR >= 4
   StringRef getPassName() const override {
 
 #else
   const char *getPassName() const override {
 #endif
+#endif
 
 #if LLVM_MAJOR >= 11                                /* use new pass manager */
   PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);