From 0709d00b10e6d23245d076120402c2c3b567edd9 Mon Sep 17 00:00:00 2001
From: hexcoder <hexcoder-@users.noreply.github.com>
Date: Tue, 30 Mar 2021 09:44:51 +0200
Subject: [PATCH 1/6] add parallel builds

---
 TODO.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TODO.md b/TODO.md
index b8a091ff..bde328e7 100644
--- a/TODO.md
+++ b/TODO.md
@@ -11,6 +11,7 @@
  - better autodetection of shifting runtime timeout values
  - cmplog: use colorization input for havoc?
  - cmplog: too much tainted bytes, directly add to dict and skip?
+ - parallel builds for source-only targets
 
 
 ## Further down the road

From 845c584b9cee7092772305912508b825155142fa Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 4 Apr 2021 17:41:43 +0000
Subject: [PATCH 2/6] Fix Haiku references, no <sys/syscall.h> and missing
 defines for USEMMAP

---
 instrumentation/afl-compiler-rt.o.c          | 4 +++-
 utils/afl_network_proxy/afl-network-server.c | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c
index f241447a..fa53263c 100644
--- a/instrumentation/afl-compiler-rt.o.c
+++ b/instrumentation/afl-compiler-rt.o.c
@@ -34,8 +34,10 @@
 #include <errno.h>
 
 #include <sys/mman.h>
-#include <sys/syscall.h>
 #ifndef __HAIKU__
+  #include <sys/syscall.h>
+#endif
+#ifndef USEMMAP
   #include <sys/shm.h>
 #endif
 #include <sys/wait.h>
diff --git a/utils/afl_network_proxy/afl-network-server.c b/utils/afl_network_proxy/afl-network-server.c
index 0dfae658..60f174ee 100644
--- a/utils/afl_network_proxy/afl-network-server.c
+++ b/utils/afl_network_proxy/afl-network-server.c
@@ -45,7 +45,6 @@
 
 #include <sys/wait.h>
 #include <sys/time.h>
-#include <sys/shm.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/resource.h>
@@ -53,7 +52,9 @@
 #include <netinet/ip6.h>
 #include <arpa/inet.h>
 #include <sys/mman.h>
-#include <sys/shm.h>
+#ifndef USEMMAP
+  #include <sys/shm.h>
+#endif
 #include <sys/socket.h>
 #include <netdb.h>
 

From 96b743094dc5a158b8588c4bdf58057161a99e8e Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 4 Apr 2021 19:25:04 +0000
Subject: [PATCH 3/6] Add -lnetwork to dependencies for Haiku

---
 GNUmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index ac8fe796..542097a3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -164,7 +164,7 @@ endif
 ifeq "$(shell uname -s)" "Haiku"
   SHMAT_OK=0
   override CFLAGS  += -DUSEMMAP=1 -Wno-error=format -fPIC
-  LDFLAGS += -Wno-deprecated-declarations -lgnu
+  LDFLAGS += -Wno-deprecated-declarations -lgnu -lnetwork
   SPECIAL_PERFORMANCE += -DUSEMMAP=1
 endif
 

From f2efd940358374b9693e3f4323c159a6c6e7d20a Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 4 Apr 2021 20:16:41 +0000
Subject: [PATCH 4/6] fix conflict

---
 TODO.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/TODO.md b/TODO.md
index bde328e7..b8a091ff 100644
--- a/TODO.md
+++ b/TODO.md
@@ -11,7 +11,6 @@
  - better autodetection of shifting runtime timeout values
  - cmplog: use colorization input for havoc?
  - cmplog: too much tainted bytes, directly add to dict and skip?
- - parallel builds for source-only targets
 
 
 ## Further down the road

From a02d84a11cb28bc620bf24bda322e14701ad726f Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 5 Apr 2021 11:56:04 +0000
Subject: [PATCH 5/6] Fix undeclared SYS_write on Haiku

---
 instrumentation/afl-compiler-rt.o.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c
index fa53263c..9bb6114b 100644
--- a/instrumentation/afl-compiler-rt.o.c
+++ b/instrumentation/afl-compiler-rt.o.c
@@ -1740,7 +1740,11 @@ static int area_is_valid(void *ptr, size_t len) {
 
   if (unlikely(!ptr || __asan_region_is_poisoned(ptr, len))) { return 0; }
 
-  long r = syscall(SYS_write, __afl_dummy_fd[1], ptr, len);
+  #ifndef __HAIKU__
+    long r = syscall(SYS_write, __afl_dummy_fd[1], ptr, len);
+  #else
+    long r = _kern_write(__afl_dummy_fd[1], -1, ptr, len);
+  #endif // HAIKU
 
   if (r <= 0 || r > len) return 0;
 

From 43b1a0d46bd7fb55e2baeadd5d105e60aecdee9c Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 5 Apr 2021 13:02:26 +0000
Subject: [PATCH 6/6] Declare private api __kern_write for Haiku

---
 instrumentation/afl-compiler-rt.o.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c
index 9bb6114b..50ecba80 100644
--- a/instrumentation/afl-compiler-rt.o.c
+++ b/instrumentation/afl-compiler-rt.o.c
@@ -78,6 +78,10 @@
   #define MAP_INITIAL_SIZE MAP_SIZE
 #endif
 
+#if defined(__HAIKU__)
+  extern ssize_t _kern_write(int fd, off_t pos, const void *buffer,	size_t bufferSize);
+#endif // HAIKU
+
 u8   __afl_area_initial[MAP_INITIAL_SIZE];
 u8 * __afl_area_ptr_dummy = __afl_area_initial;
 u8 * __afl_area_ptr = __afl_area_initial;