From b5dae8e4f1b32cc256719e862e731fabc59029ba Mon Sep 17 00:00:00 2001 From: van Hauser Date: Sat, 8 Feb 2020 13:43:26 +0100 Subject: fix for md changes --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 70eac6b9..e1307fb1 100644 --- a/Makefile +++ b/Makefile @@ -423,7 +423,7 @@ endif install -m 755 afl-as $${DESTDIR}$(HELPER_PATH) ln -sf afl-as $${DESTDIR}$(HELPER_PATH)/as - install -m 644 docs/*.md docs/ChangeLog $${DESTDIR}$(DOC_PATH) + install -m 644 docs/*.md $${DESTDIR}$(DOC_PATH) cp -r testcases/ $${DESTDIR}$(MISC_PATH) cp -r dictionaries/ $${DESTDIR}$(MISC_PATH) -- cgit 1.4.1 From b6209b373217a7cc84e229cf8f7fff3253815b8e Mon Sep 17 00:00:00 2001 From: hexcoder- Date: Sat, 8 Feb 2020 17:23:45 +0100 Subject: build fixes for FreeBSD 11 --- Makefile | 1 + libdislocator/libdislocator.so.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e1307fb1..c5781256 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,7 @@ endif ifneq "$(findstring FreeBSD, $(shell uname))" "" CFLAGS += -pthread + LDFLAGS += -lpthread endif ifneq "$(findstring NetBSD, $(shell uname))" "" diff --git a/libdislocator/libdislocator.so.c b/libdislocator/libdislocator.so.c index a426c387..98f16358 100644 --- a/libdislocator/libdislocator.so.c +++ b/libdislocator/libdislocator.so.c @@ -64,7 +64,7 @@ #include "config.h" #include "types.h" -#if __STDC_VERSION__ < 201112L +#if __STDC_VERSION__ < 201112L || defined __FreeBSD__ // use this hack if not C11 typedef struct { -- cgit 1.4.1 From 0aad26d85ee13c56acfed7204a9e2f18ec2079e1 Mon Sep 17 00:00:00 2001 From: hexcoder- Date: Sat, 8 Feb 2020 16:38:24 +0100 Subject: add libpthread on NetBSD --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c5781256..9cfe7206 100644 --- a/Makefile +++ b/Makefile @@ -114,6 +114,7 @@ endif ifneq "$(findstring NetBSD, $(shell uname))" "" CFLAGS += -pthread + LDFLAGS += -lpthread endif ifeq "$(findstring clang, $(shell $(CC) --version 2>/dev/null))" "" -- cgit 1.4.1 From a93e11b79702eece7bda93bc8646c0bb9c2b0b64 Mon Sep 17 00:00:00 2001 From: hexcoder- Date: Sat, 8 Feb 2020 16:50:37 +0100 Subject: first work for OpenIndiana (solaris flavor) --- Makefile | 2 ++ test/test.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9cfe7206..5af8444a 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,9 @@ endif ifneq "$(shell uname -m)" "x86_64" ifneq "$(shell uname -m)" "i386" ifneq "$(shell uname -m)" "amd64" + ifneq "$(shell uname -m)" "i86pc" AFL_NO_X86=1 + endif endif endif endif diff --git a/test/test.sh b/test/test.sh index 1709468e..db197cf2 100755 --- a/test/test.sh +++ b/test/test.sh @@ -75,7 +75,7 @@ $ECHO "${RESET}${GREY}[*] starting afl++ test framework ..." test -z "$SYS" && $ECHO "$YELLOW[-] uname -m did not succeed" $ECHO "$BLUE[*] Testing: ${AFL_GCC}, afl-showmap, afl-fuzz, afl-cmin and afl-tmin" -test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" && { +test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc" && { test -e ../${AFL_GCC} -a -e ../afl-showmap -a -e ../afl-fuzz && { ../${AFL_GCC} -o test-instr.plain ../test-instr.c > /dev/null 2>&1 AFL_HARDEN=1 ../${AFL_GCC} -o test-compcov.harden test-compcov.c > /dev/null 2>&1 @@ -263,7 +263,7 @@ test -e ../afl-clang-fast -a -e ../split-switches-pass.so && { $ECHO "$RED[!] afl-fuzz is not working correctly with llvm_mode" CODE=1 } - test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" || { + test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc" || { echo 000000000000000000000000 > in/in2 echo 111 > in/in3 mkdir -p in2 @@ -583,7 +583,7 @@ test -e ../afl-qemu-trace && { } rm -f errors - test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" && { + test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc" && { $ECHO "$GREY[*] running afl-fuzz for persistent qemu_mode, this will take approx 10 seconds" { export AFL_QEMU_PERSISTENT_ADDR=`expr 0x4$(nm test-instr | grep "T main" | awk '{print $1}' | sed 's/^.......//')` -- cgit 1.4.1