about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2019-07-21 20:24:40 +0200
committervan Hauser <vh@thc.org>2019-07-21 20:24:40 +0200
commitf697752b52e619bdda2a5b629568e56c8f28fe47 (patch)
treeae600e39881d5e2b23f9f6712fe9aab24a2102a5
parent914426d8877a111563dca3d4ec769c9ee95254e6 (diff)
downloadafl++-f697752b52e619bdda2a5b629568e56c8f28fe47.tar.gz
moved gcc_plugin to a branch, it is nowhere near "ok"
-rw-r--r--Makefile2
-rw-r--r--afl-gcc.c2
-rw-r--r--docs/ChangeLog3
-rw-r--r--docs/PATCHES1
-rw-r--r--docs/README3
5 files changed, 3 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 69bd7535..d2840848 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ install: all
 	install -m 755 $(PROGS) $(SH_PROGS) $${DESTDIR}$(BIN_PATH)
 	rm -f $${DESTDIR}$(BIN_PATH)/afl-as
 	if [ -f afl-qemu-trace ]; then install -m 755 afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi
-	if [ -f afl-gcc-fast ]; then set e; install -m 755 afl-gcc-fast $${DESTDIR}$(BIN_PATH); ln -sf afl-gcc-fast $${DESTDIR}$(BIN_PATH)/afl-g++-fast; install -m 755 afl-gcc-pass.so afl-gcc-rt.o $${DESTDIR}$(HELPER_PATH); fi
+	#if [ -f afl-gcc-fast ]; then set e; install -m 755 afl-gcc-fast $${DESTDIR}$(BIN_PATH); ln -sf afl-gcc-fast $${DESTDIR}$(BIN_PATH)/afl-g++-fast; install -m 755 afl-gcc-pass.so afl-gcc-rt.o $${DESTDIR}$(HELPER_PATH); fi
 ifndef AFL_TRACE_PC
 	if [ -f afl-clang-fast -a -f libLLVMInsTrim.so -a -f afl-llvm-rt.o ]; then set -e; install -m 755 afl-clang-fast $${DESTDIR}$(BIN_PATH); ln -sf afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang-fast++; install -m 755 libLLVMInsTrim.so afl-llvm-pass.so afl-llvm-rt.o $${DESTDIR}$(HELPER_PATH); fi
 else
diff --git a/afl-gcc.c b/afl-gcc.c
index d109f6e2..f6ededeb 100644
--- a/afl-gcc.c
+++ b/afl-gcc.c
@@ -308,7 +308,7 @@ int main(int argc, char** argv) {
   if (isatty(2) && !getenv("AFL_QUIET")) {
 
     SAYF(cCYA "afl-cc" VERSION cRST " by <lcamtuf@google.com>\n");
-    SAYF(cYEL "[!] " cBRI "WARNING: " cRST "afl-gcc is deprecated, gcc_plugin is faster, llvm_mode even faster\n");
+    SAYF(cYEL "[!] " cBRI "NOTE: " cRST "afl-gcc is deprecated, llvm_mode is much faster and has more options\n");
 
   } else be_quiet = 1;
 
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 44eb4012..120893d9 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -24,9 +24,6 @@ Version ++2.52d (tbd):
   - all queue, hang and crash files now have their discovery time in their name
   - if llvm_mode was compiled, afl-clang/afl-clang++ will point to these
     instead of afl-gcc
-  - added gcc_plugin which is like llvm_mode but for gcc. This version
-    supports gcc version 5 to 8. See gcc_plugin/README.gcc
-    (https://github.com/T12z/afl)
   - added instrim, a much faster llvm_mode instrumentation at the cost of
     path discovery. See llvm_mode/README.instrim (https://github.com/csienslab/instrim)
   - added MOpt (github.com/puppet-meteor/MOpt-AFL) mode, see docs/README.MOpt
diff --git a/docs/PATCHES b/docs/PATCHES
index 78050208..f6ca9284 100644
--- a/docs/PATCHES
+++ b/docs/PATCHES
@@ -17,7 +17,6 @@ afl-qemu-optimize-entrypoint.diff	by mh(at)mh-sec(dot)de
 afl-qemu-speed.diff			by abiondo on github
 afl-qemu-optimize-map.diff		by mh(at)mh-sec(dot)de
 
-+ gcc_plugin (https://github.com/T12z/afl)
 + instrim (https://github.com/csienslab/instrim) was integrated
 + MOpt (github.com/puppet-meteor/MOpt-AFL) was imported
 + AFLfast additions (github.com/mboehme/aflfast) were incorporated.
diff --git a/docs/README b/docs/README
index a8ec715b..b606f6cf 100644
--- a/docs/README
+++ b/docs/README
@@ -10,6 +10,7 @@ american fuzzy lop plus plus
   <heiko.eissfeldt@hexco.de> and Andrea Fioraldi as there have been no
   updates to afl since November 2017.
 
+
   Many improvements were made, e.g. more performant llvm_mode, supporting
   llvm up to version 8, Qemu 3.1, more speed for Qemu, etc.
 
@@ -25,8 +26,6 @@ american fuzzy lop plus plus
   Also newly integrated is instrim, a very effective CFG llvm_mode
   instrumentation implementation from https://github.com/csienslab/instrim
 
-  Similar to llvm_mode a gcc_plugin that supports versions 5 to 8 is
-  now available (from https://github.com/T12z/afl)
 
   A more thorough list is available in the PATCHES file.