From a7c3f252d57707ca2c0035be6cbe80635cf8857b Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Mon, 24 Aug 2020 11:06:04 +0100 Subject: unicorn build warning for MUSL based linux distros. (#510) --- unicorn_mode/build_unicorn_support.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'unicorn_mode') diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh index 841728d7..b4d2058f 100755 --- a/unicorn_mode/build_unicorn_support.sh +++ b/unicorn_mode/build_unicorn_support.sh @@ -70,6 +70,11 @@ MAKECMD=make TARCMD=tar if [ "$PLT" = "Linux" ]; then + MUSL=`ldd --version 2>&1 | head -n 1 | cut -f 1 -d " "` + if [ "musl" = $MUSL ]; then + echo "[-] Error: Unicorn instrumentation is unsupported with the musl's libc." + exit 1 + fi CORES=`nproc` fi -- cgit 1.4.1 From 9e8b3f13e198dda74d4673866ffc4a37c976c05e Mon Sep 17 00:00:00 2001 From: domenukk Date: Mon, 31 Aug 2020 15:17:37 +0200 Subject: fixed warning on mac --- src/afl-as.c | 2 +- unicorn_mode/unicornafl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'unicorn_mode') diff --git a/src/afl-as.c b/src/afl-as.c index 0ed47d8c..7d70bfcd 100644 --- a/src/afl-as.c +++ b/src/afl-as.c @@ -152,7 +152,7 @@ static void edit_params(int argc, char **argv) { /* The Apple case is a bit different... */ - if (!strcmp(argv[i], "-arch") && i + 1 < argc) { + if (!strcmp(argv[i], "-arch") && i + 1 < (u32)argc) { if (!strcmp(argv[i + 1], "x86_64")) use_64bit = 1; diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl index c6d66471..c21a5ebb 160000 --- a/unicorn_mode/unicornafl +++ b/unicorn_mode/unicornafl @@ -1 +1 @@ -Subproject commit c6d6647161a32bae88785a618fcd828d1711d9e6 +Subproject commit c21a5ebbbeb2dbaab84435642c49952060778243 -- cgit 1.4.1 From 01fcee1190acbcb4d9c2d178ce09a631c233f2be Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Mon, 31 Aug 2020 17:36:16 +0200 Subject: fixed make install on mac os --- GNUmakefile | 4 +++- unicorn_mode/unicornafl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'unicorn_mode') diff --git a/GNUmakefile b/GNUmakefile index ba3a95a3..39283f4f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -34,7 +34,6 @@ VERSION = $(shell grep '^$(HASH)define VERSION ' ../config.h | cut -d '"' -f PROGS = afl-gcc afl-fuzz afl-showmap afl-tmin afl-gotcpu afl-analyze SH_PROGS = afl-plot afl-cmin afl-cmin.bash afl-whatsup afl-system-config MANPAGES=$(foreach p, $(PROGS) $(SH_PROGS), $(p).8) afl-as.8 afl-g++.8 -ASAN_OPTIONS=detect_leaks=0 ifeq "$(findstring android, $(shell $(CC) --version 2>/dev/null))" "" ifeq "$(shell echo 'int main() {return 0; }' | $(CC) $(CFLAGS) -Werror -x c - -flto=full -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1" @@ -282,6 +281,9 @@ all: test_x86 test_shm test_python ready $(PROGS) afl-as test_build all_done man: afl-gcc all $(MANPAGES) +# dummy to get `make man` to compile on mac os +afl-g++.8: + tests: source-only @cd test ; ./test-all.sh @rm -f test/errors diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl index c21a5ebb..c6d66471 160000 --- a/unicorn_mode/unicornafl +++ b/unicorn_mode/unicornafl @@ -1 +1 @@ -Subproject commit c21a5ebbbeb2dbaab84435642c49952060778243 +Subproject commit c6d6647161a32bae88785a618fcd828d1711d9e6 -- cgit 1.4.1