diff options
| author | van Hauser <vh@thc.org> | 2020-06-17 15:05:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 15:05:14 +0200 |
| commit | 0dc9967984df3f9c250d4c27b6de1cbd4cac3eb3 (patch) | |
| tree | ca6096f1d22ba87c262bdeaf57455520ef3143e2 /gcc_plugin | |
| parent | 12bdefe00e38cdc3dd8cb028eeac325ab2e94e16 (diff) | |
| parent | 889e54eab858b1928f74a8c179b32275b62f2286 (diff) | |
| download | afl++-0dc9967984df3f9c250d4c27b6de1cbd4cac3eb3.tar.gz | |
Merge pull request #403 from AFLplusplus/dev
push to master
Diffstat (limited to 'gcc_plugin')
| -rw-r--r-- | gcc_plugin/GNUmakefile | 4 | ||||
| -rw-r--r-- | gcc_plugin/afl-gcc-fast.c | 2 | ||||
| -rw-r--r-- | gcc_plugin/afl-gcc-rt.o.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gcc_plugin/GNUmakefile b/gcc_plugin/GNUmakefile index 9a404966..0f69e924 100644 --- a/gcc_plugin/GNUmakefile +++ b/gcc_plugin/GNUmakefile @@ -61,12 +61,14 @@ ifeq "$(shell echo '$(HASH)include <sys/ipc.h>@$(HASH)include <sys/shm.h>@int ma else SHMAT_OK=0 CFLAGS+=-DUSEMMAP=1 - LDFLAGS += -lrt endif ifeq "$(TEST_MMAP)" "1" SHMAT_OK=0 CFLAGS+=-DUSEMMAP=1 +endif + +ifneq "$(shell uname -s)" "Haiku" LDFLAGS += -lrt endif diff --git a/gcc_plugin/afl-gcc-fast.c b/gcc_plugin/afl-gcc-fast.c index 164c72c2..bd780b40 100644 --- a/gcc_plugin/afl-gcc-fast.c +++ b/gcc_plugin/afl-gcc-fast.c @@ -231,7 +231,7 @@ static void edit_params(u32 argc, char **argv) { } -#ifdef USEMMAP +#if defined(USEMMAP) && !defined(__HAIKU__) cc_params[cc_par_cnt++] = "-lrt"; #endif diff --git a/gcc_plugin/afl-gcc-rt.o.c b/gcc_plugin/afl-gcc-rt.o.c index f41bea17..49a03cae 100644 --- a/gcc_plugin/afl-gcc-rt.o.c +++ b/gcc_plugin/afl-gcc-rt.o.c @@ -35,7 +35,9 @@ #include <assert.h> #include <sys/mman.h> -#include <sys/shm.h> +#ifndef USEMMAP + #include <sys/shm.h> +#endif #include <sys/wait.h> #include <sys/types.h> |