about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2019-06-02 22:39:04 +0200
committervan Hauser <vh@thc.org>2019-06-02 22:39:04 +0200
commit835b84fc4953f38322084b8de08511e471f48a4a (patch)
tree29fafc8b3abe52e75b26a947feb846c4cf2009fc
parent49a08e38b9afd4506e7efd191533884abe803939 (diff)
downloadafl++-835b84fc4953f38322084b8de08511e471f48a4a.tar.gz
set to compile with llvm 5.0 and 6.0
-rw-r--r--docs/ChangeLog3
-rw-r--r--llvm_mode/Makefile1
-rw-r--r--llvm_mode/README.llvm5
3 files changed, 6 insertions, 3 deletions
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 264057c7..620623a2 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -27,7 +27,8 @@ Version ++2.52c (2019-05-28):
     to the AFL schedule, not to the FAST schedule. So nothing changes unless
     you use the new -p option :-) - see docs/power_schedules.txt
   - added afl-system-config script to set all system performance options for fuzzing
-  - llvm_mode support currently LLVM 8, 4.0 and 3.9 (thanks to Heiko Eissfeldt for the patch)
+  - llvm_mode is currently configured to work with llvm 5.0 and 6.0.
+    To compile with 3.9 or 4.0 you must change CXX to clang++ in llvm_mode/Makefile
 
 
 ---------------------------
diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile
index ec417e2e..100d57f5 100644
--- a/llvm_mode/Makefile
+++ b/llvm_mode/Makefile
@@ -51,6 +51,7 @@ endif
 
 ifeq "$(origin CC)" "default"
   CC         = clang
+  # if you use llvm 3.9 or 4.0 switch this to clang++ below
   CXX        = g++
 endif
 
diff --git a/llvm_mode/README.llvm b/llvm_mode/README.llvm
index 846d2d47..c6d21783 100644
--- a/llvm_mode/README.llvm
+++ b/llvm_mode/README.llvm
@@ -7,8 +7,9 @@ Fast LLVM-based instrumentation for afl-fuzz
 1) Introduction
 ---------------
 
-!!! This currently only works with LLVM version 3.9, 4.0 and 8 !!!
-  ! Fixes for the versions in between are in the works !
+! llvm_mode is currently configured to compile with llvm 5.0 and 6.0 via g++ !
+! To compile with llvm 3.9 and 4.0 edit the Makefile and change CXX to clang++ !
+! Fixes for llvm 3.7, 7 and 8 are in the work !
 
 The code in this directory allows you to instrument programs for AFL using
 true compiler-level instrumentation, instead of the more crude