Merge pull request #584 from devnexen/dfbsd_build_fix

DragonFlyBSD build fix proposal.
This commit is contained in:
van Hauser
2020-10-14 17:37:21 +02:00
committed by GitHub
3 changed files with 8 additions and 2 deletions

View File

@ -56,7 +56,8 @@ ifeq "$(findstring Foundation,$(shell $(CC) --version))" ""
CXX = g++ CXX = g++
endif endif
PLUGIN_FLAGS = -fPIC -fno-rtti -I"$(shell $(CC) -print-file-name=plugin)/include" PLUGIN_BASE = "$(shell $(CC) -print-file-name=plugin)"
PLUGIN_FLAGS = -fPIC -fno-rtti -I$(PLUGIN_BASE)/include -I$(PLUGIN_BASE)
HASH=\# HASH=\#
GCCVER = $(shell $(CC) --version 2>/dev/null | awk 'NR == 1 {print $$NF}') GCCVER = $(shell $(CC) --version 2>/dev/null | awk 'NR == 1 {print $$NF}')
@ -88,6 +89,10 @@ ifeq "$(shell uname -s)" "OpenBSD"
PLUGIN_FLAGS += -I/usr/local/include PLUGIN_FLAGS += -I/usr/local/include
endif endif
ifeq "$(shell uname -s)" "DragonFly"
PLUGIN_FLAGS += -I/usr/local/include
endif
ifeq "$(shell uname -s)" "SunOS" ifeq "$(shell uname -s)" "SunOS"
PLUGIN_FLAGS += -I/usr/include/gmp PLUGIN_FLAGS += -I/usr/include/gmp
endif endif

View File

@ -66,6 +66,7 @@
#include <sched.h> #include <sched.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/time.h> #include <sys/time.h>

View File

@ -272,7 +272,7 @@ void bind_to_free_cpu(afl_state_t *afl) {
#elif defined(__DragonFly__) #elif defined(__DragonFly__)
if (procs[i].kp_lwp.kl_cpuid < sizeof(cpu_used) && if (procs[i].kp_lwp.kl_cpuid < (s32)sizeof(cpu_used) &&
procs[i].kp_lwp.kl_pctcpu > 10) procs[i].kp_lwp.kl_pctcpu > 10)
cpu_used[procs[i].kp_lwp.kl_cpuid] = 1; cpu_used[procs[i].kp_lwp.kl_cpuid] = 1;