final touches

5 files changed, 20 insertions, 11 deletions

diff --git a/.travis.yml b/.travis.yml
index f14e0338..2f6ccd1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,9 @@ matrix:
     dist: xenial
     arch: arm64
     env: NAME="xenial-arm64" MODERN="no" GCC="5" EXTRA="libtool-bin" AFL_NO_X86="1" CPU_TARGET="aarch64"
-  - os: osx
-    osx_image: xcode11.2
-    env: NAME="osx" HOMEBREW_NO_ANALYTICS="1" LINK="http://releases.llvm.org/9.0.0/" NAME="clang+llvm-9.0.0-x86_64-darwin-apple"
+#  - os: osx
+#    osx_image: xcode11.2
+#    env: NAME="osx" HOMEBREW_NO_ANALYTICS="1" LINK="http://releases.llvm.org/9.0.0/" NAME="clang+llvm-9.0.0-x86_64-darwin-apple"
 
 jobs:
   allow_failures:
diff --git a/docs/ChangeLog b/docs/ChangeLog
index cc742797..f42d380f 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -24,8 +24,10 @@ Version ++2.58d (dev):
      - added Radamsa and an optional radamsa stage (-R)
      - CPU affinity support for DragonFly
      - added -u command line option to not unlink the fuzz input file
-  - llvm_mode: float splitting is now configured via AFL_LLVM_LAF_SPLIT_FLOATS
-  - libtokencap: support for *BSD/OSX added
+  - llvm_mode:
+     - float splitting is now configured via AFL_LLVM_LAF_SPLIT_FLOATS
+     - support for llvm 10 included now (thanks to devnexen)
+  - libtokencap: support for *BSD/OSX/Dragonfly added
   - compcov: floating point splitting support for QEMU on x86 targets
   - Dockerfile by courtesy of devnexen
   - ripped regex.dictionary from Google afl PR
diff --git a/gcc_plugin/afl-gcc-fast.c b/gcc_plugin/afl-gcc-fast.c
index 6522aa69..9536bdf6 100644
--- a/gcc_plugin/afl-gcc-fast.c
+++ b/gcc_plugin/afl-gcc-fast.c
@@ -326,9 +326,12 @@ int main(int argc, char** argv) {
               " initially by <aseipp@pobox.com>, maintainer: hexcoder-\n");
 
     if (getenv("AFL_GCC_WHITELIST") == NULL) {
-    
-      SAYF(cYEL "Warning:" cRST " using afl-gcc-fast without using AFL_GCC_WHITELIST currently produces worse results than afl-gcc. Even better, use llvm_mode for now.\n");
-    
+
+      SAYF(cYEL "Warning:" cRST
+                " using afl-gcc-fast without using AFL_GCC_WHITELIST currently "
+                "produces worse results than afl-gcc. Even better, use "
+                "llvm_mode for now.\n");
+
     }
 
   }
diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile
index 6c1ff176..8c769361 100644
--- a/llvm_mode/Makefile
+++ b/llvm_mode/Makefile
@@ -47,15 +47,19 @@ ifeq "$(LLVM_UNSUPPORTED)" "1"
   $(warn llvm_mode only supports versions 3.8.0 up to 9)
 endif
 
-# this is not visible yet:
 ifeq "$(LLVM_MAJOR)" "9"
   $(info llvm_mode detected llvm 9, enabling neverZero implementation)
 endif
 
 ifeq "$(LLVM_NEW_API)" "1"
+  $(info llvm_mode detected llvm 10+, enabling neverZero implementation and c++14)
   LLVM_STDCXX = c++14
 endif
 
+ifeq "$(LLVM_APPLE)" "1"
+  $(warn llvm_mode will not compile with Xcode clang...)
+endif
+
 CFLAGS      ?= -O3 -funroll-loops
 CFLAGS      += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign -I ../include/ \
                -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
diff --git a/test/test.sh b/test/test.sh
index e32ebe21..7ac477a9 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -427,9 +427,9 @@ test -e ../libradamsa.so && {
   test -e test-instr.plain && {
     mkdir -p in
     echo 0 > in/in
-    $ECHO "$GREY[*] running afl-fuzz with radamsa, this will take approx 20 seconds"
+    $ECHO "$GREY[*] running afl-fuzz with radamsa, this will take approx 30 seconds"
     {
-      ../afl-fuzz -RR -V20 -m ${MEM_LIMIT} -i in -o out -- ./test-instr.plain >>errors 2>&1
+      ../afl-fuzz -RR -V30 -m ${MEM_LIMIT} -i in -o out -- ./test-instr.plain >>errors 2>&1
     } >>errors 2>&1
     test -n "$( ls out/queue/id:000002* 2> /dev/null )" && {
       $ECHO "$GREEN[+] libradamsa performs good - and very slow - mutations"