From c0554b9cc62c4ef0aeb307184db0eeaeeaebba20 Mon Sep 17 00:00:00 2001
From: Thomas HUET <git@thomash.fr>
Date: Wed, 16 Dec 2015 05:42:06 +0100
Subject: [PATCH] 1.96b

---
 Makefile                      |  2 +-
 afl-fuzz.c                    |  2 +-
 docs/ChangeLog                | 10 ++++++++++
 docs/README                   |  2 +-
 llvm_mode/Makefile            |  2 +-
 llvm_mode/README.llvm         |  2 +-
 llvm_mode/afl-llvm-pass.so.cc |  2 +-
 7 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 40128933..acad475a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 #
 
 PROGNAME    = afl
-VERSION     = 1.95b
+VERSION     = 1.96b
 
 PREFIX     ?= /usr/local
 BIN_PATH    = $(PREFIX)/bin
diff --git a/afl-fuzz.c b/afl-fuzz.c
index 88839d0a..464f9b10 100644
--- a/afl-fuzz.c
+++ b/afl-fuzz.c
@@ -1523,7 +1523,7 @@ static void load_extras(u8* dir) {
 
   }
 
-  if (x) FATAL("Dictinary levels not supported for directories.");
+  if (x) FATAL("Dictionary levels not supported for directories.");
 
   while ((de = readdir(d))) {
 
diff --git a/docs/ChangeLog b/docs/ChangeLog
index eb28122b..a00cc51e 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -16,6 +16,16 @@ Not sure if you should upgrade? The lowest currently recommended version
 is 1.92b. If you're stuck on an earlier release, it's strongly advisable
 to get on with the times.
 
+--------------
+Version 1.96b:
+--------------
+
+  - Added -fpic to CFLAGS for the clang plugin, as suggested by Hanno Boeck.
+
+  - Made another clang change (IRBuilder) suggested by Jeff Trull.
+
+  - Fixed several typos, spotted by Jakub Wilk.
+
 --------------
 Version 1.95b:
 --------------
diff --git a/docs/README b/docs/README
index 832f6324..2f153849 100644
--- a/docs/README
+++ b/docs/README
@@ -424,7 +424,7 @@ bug reports, or patches from:
   rc0r                                  Jonathan Foote
   Christian Holler                      Dominique Pelle
   Jacek Wielemborek                     Leo Barnes
-  Jeremy Barnes
+  Jeremy Barnes                         Jeff Trull
 
 Thank you!
 
diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile
index 7ea3c3f5..93690a39 100644
--- a/llvm_mode/Makefile
+++ b/llvm_mode/Makefile
@@ -33,7 +33,7 @@ CXXFLAGS    ?= -O3 -funroll-loops
 CXXFLAGS    += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \
                -DVERSION=\"$(VERSION)\"
 
-CLANG_CFL    = `$(LLVM_CONFIG) --cxxflags` -fno-rtti $(CXXFLAGS)
+CLANG_CFL    = `$(LLVM_CONFIG) --cxxflags` -fno-rtti -fpic $(CXXFLAGS)
 CLANG_LFL    = `$(LLVM_CONFIG) --ldflags` $(LDFLAGS)
 
 # User teor2345 reports that this is required to make things work on MacOS X.
diff --git a/llvm_mode/README.llvm b/llvm_mode/README.llvm
index c70b20f6..63f99f19 100644
--- a/llvm_mode/README.llvm
+++ b/llvm_mode/README.llvm
@@ -121,7 +121,7 @@ With the location selected, add this code in the appropriate spot:
 You don't need the #ifdef guards, but including them ensures that the program
 will keep working normally when compiled with a tool other than afl-clang-fast.
 
-Finally, recompile the pogram with afl-clang-fast (afl-gcc or afl-clang will
+Finally, recompile the program with afl-clang-fast (afl-gcc or afl-clang will
 *not* generate a deferred-initialization binary) - and you should be all set!
 
 5) Bonus feature #2: persistent mode
diff --git a/llvm_mode/afl-llvm-pass.so.cc b/llvm_mode/afl-llvm-pass.so.cc
index 771b4d87..321dd0c2 100644
--- a/llvm_mode/afl-llvm-pass.so.cc
+++ b/llvm_mode/afl-llvm-pass.so.cc
@@ -109,7 +109,7 @@ bool AFLCoverage::runOnModule(Module &M) {
     for (auto &BB : F) {
 
       BasicBlock::iterator IP = BB.getFirstInsertionPt();
-      IRBuilder<> IRB(IP);
+      IRBuilder<> IRB(&(*IP));
 
       if (R(100) >= inst_ratio) continue;