Merge pull request #87 from devnexen/freebsd_port

freebsd portage proposal.

Author: struct

.cirrus.yml

@@ -0,0 +1,15 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+  ARCH: amd64
+
+freebsd_instance:
+  # TODO: the 13.1 image should be around the corner soon
+  image_family: freebsd-13-0
+
+task:
+  name: testsuite-freebsd-amd64
+  install_script:
+    - pkg install bash gmake
+  script:
+    - gmake tests
+    - gmake cpp_tests

Makefile

@@ -171,6 +171,12 @@ ifeq ($(UNAME), Linux)
 STRIP = strip -s $(BUILD_DIR)/$(LIBNAME)
 endif
 
+ifeq ($(UNAME), FreeBSD)
+STRIP = strip -s $(BUILD_DIR)/$(LIBNAME)
+## Using spinlocks to avoid recursive locks contentions with calloc
+USE_SPINLOCK = -DUSE_SPINLOCK=1
+endif
+
 HOOKS = $(MALLOC_HOOK)
 OPTIMIZE = -O2 -fstrict-aliasing -Wstrict-aliasing
 COMMON_CFLAGS = -Wall -Iinclude/ $(THREAD_SUPPORT) $(PRE_POPULATE_PAGES) $(STARTUP_MEM_USAGE)

include/conf.h

@@ -60,7 +60,7 @@
 /* See PERFORMANCE.md for notes on huge page sizes.
  * If your system uses a non-default value for huge
  * page sizes you will need to adjust that here */
-#if (__linux__ && MAP_HUGETLB) || (__APPLE__ && VM_FLAGS_SUPERPAGE_SIZE_2MB) && HUGE_PAGES
+#if (__linux__ && MAP_HUGETLB) || (__APPLE__ && VM_FLAGS_SUPERPAGE_SIZE_2MB) || (__FreeBSD__ && MAP_HUGETLB) && HUGE_PAGES
 #define HUGE_PAGE_SZ 2097152
 #endif
 

include/iso_alloc_internal.h

@@ -79,6 +79,10 @@ using namespace std;
 #include <sched.h>
 #endif
 
+#if defined(__FreeBSD__)
+#define MAP_HUGETLB MAP_ALIGNED_SUPER
+#endif
+
 #if HEAP_PROFILER
 #include <fcntl.h>
 #endif

src/iso_alloc_random.c

@@ -9,6 +9,8 @@
 #include <sys/syscall.h>
 #elif __APPLE__
 #include <Security/SecRandom.h>
+#elif __FreeBSD__
+#include <sys/random.h>
 #else
 #error "unknown OS"
 #endif
@@ -27,6 +29,8 @@ INTERNAL_HIDDEN uint64_t rand_uint64(void) {
     ret = syscall(SYS_getrandom, &val, sizeof(val), GRND_NONBLOCK) != sizeof(val);
 #elif __APPLE__
     ret = SecRandomCopyBytes(kSecRandomDefault, sizeof(val), &val);
+#elif __FreeBSD__
+    ret = getrandom(&val, sizeof(val), GRND_NONBLOCK) != sizeof(val);
 #endif
 
 #if ABORT_NO_ENTROPY

utils/run_tests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This script runs all debug tests including vulnerable
 # examples of code that should crash
 $(echo '' > test_output.txt)