about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-01-02 08:39:29 +0100
committervan Hauser <vh@thc.org>2020-01-02 08:39:29 +0100
commit3827b912c7090314bb011fe6c1ccfaf0d33fc678 (patch)
treea7a3db2ade9f485e8a6941523eac52cab714c376
parent345c1deb58d2b9249879cb020b9aac322781ba08 (diff)
downloadafl++-3827b912c7090314bb011fe6c1ccfaf0d33fc678.tar.gz
compile fixes
-rw-r--r--docs/ChangeLog5
-rw-r--r--libdislocator/Makefile4
-rw-r--r--libtokencap/Makefile4
-rw-r--r--llvm_mode/Makefile2
4 files changed, 8 insertions, 7 deletions
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 745f2587..d3b27e35 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -17,8 +17,9 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
 Version ++2.60d (develop):
 --------------------------
 
-  - exciting new stuff is coming up :-)
-  - all the best for the new year!
+  - afl-fuzz:
+     - now prints the real python version support compiled in
+  - added fix from Debian project to compile libdislocator and libtokencap
 
 
 --------------------------
diff --git a/libdislocator/Makefile b/libdislocator/Makefile
index dae187e5..279667a1 100644
--- a/libdislocator/Makefile
+++ b/libdislocator/Makefile
@@ -18,8 +18,8 @@ HELPER_PATH  = $(PREFIX)/lib/afl
 
 VERSION     = $(shell grep '^\#define VERSION ' ../config.h | cut -d '"' -f2)
 
-CFLAGS      ?= -O3 -funroll-loops -I ../include/
-CFLAGS      += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign
+CFLAGS      ?= -O3 -funroll-loops
+CFLAGS      += -I ../include/ -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign
 
 ifdef USEHUGEPAGE
 	CFLAGS += -DUSEHUGEPAGE
diff --git a/libtokencap/Makefile b/libtokencap/Makefile
index 3ecbf471..804f03c2 100644
--- a/libtokencap/Makefile
+++ b/libtokencap/Makefile
@@ -18,8 +18,8 @@ HELPER_PATH  = $(PREFIX)/lib/afl
 
 VERSION     = $(shell grep '^\#define VERSION ' ../config.h | cut -d '"' -f2)
 
-CFLAGS      ?= -O3 -funroll-loops -I ../include/
-CFLAGS      += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign
+CFLAGS      ?= -O3 -funroll-loops
+CFLAGS      += -I ../include/ -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign
 
 ifeq "$(shell uname)" "Linux"
   TARGETS = libtokencap.so
diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile
index 0e3da147..5bb1aef2 100644
--- a/llvm_mode/Makefile
+++ b/llvm_mode/Makefile
@@ -261,5 +261,5 @@ vpath  % ..
 	ln -sf afl-clang-fast.8 ../afl-clang-fast++.8
 
 clean:
-	rm -f *.o *.so *~ a.out core core.[1-9][0-9]* .test2 test-instr .test-instr0 .test-instr1 
+	rm -f *.o *.so *~ a.out core core.[1-9][0-9]* .test2 test-instr .test-instr0 .test-instr1 afl-llvm-pass.dwo
 	rm -f $(PROGS) ../afl-clang-fast++ ../afl-clang-fast*.8