Add FreeBSD 10+ support

Author: dch

GNUmakefile

@@ -1,5 +1,5 @@
 ifdef CONFIG
-	VERSION = 0.98
+	VERSION = 0.99
 	GIT_LABEL = $(shell git describe --all --long)
 
 	BUNDLE = Factor.app
@@ -140,6 +140,8 @@ default:
 help:
 	@echo "Run '$(MAKE)' with one of the following parameters:"
 	@echo ""
+	@echo "freebsd-x86-32"
+	@echo "freebsd-x86-64"
 	@echo "linux-x86-32"
 	@echo "linux-x86-64"
 	@echo "linux-ppc-32"
@@ -169,6 +171,12 @@ macosx-x86-64:
 macosx-x86-fat:
 	$(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.fat
 
+freebsd-x86-32:
+	$(MAKE) $(ALL) CONFIG=vm/Config.freebsd.x86.32
+
+freebsd-x86-64:
+	$(MAKE) $(ALL) CONFIG=vm/Config.freebsd.x86.64
+
 linux-x86-32:
 	$(MAKE) $(ALL) CONFIG=vm/Config.linux.x86.32
 

build-support/factor.sh

@@ -99,6 +99,10 @@ set_gcc() {
                 [ -z "$CXX" ] && CXX=g++
             fi
         ;;
+        freebsd)
+            CC=clang
+            CXX=clang++
+        ;;
         *)
             [ -z "$CC" ] && CC=gcc
             [ -z "$CXX" ] && CXX=g++
@@ -198,6 +202,7 @@ find_os() {
         *CYGWIN_NT*) OS=windows;;
         *CYGWIN*) OS=windows;;
         MINGW32*) OS=windows;;
+        FreeBSD)  OS=freebsd;;
         *darwin*) OS=macosx;;
         *Darwin*) OS=macosx;;
         *linux*) OS=linux;;

vm/Config.freebsd

@@ -0,0 +1,10 @@
+include vm/Config.unix
+PLAF_DLL_OBJS += vm/os-genunix.o vm/os-linux.o vm/mvm-unix.o
+PLAF_MASTER_HEADERS += vm/os-genunix.hpp vm/os-linux.hpp
+LIBS = -ldl -lm -lrt -lpthread $(X11_UI_LIBS) -Wl,--export-dynamic
+
+# clang spams warnings if we use -Wl,--no-as-needed with -c
+# -Wl,--no-as-needed is a gcc optimization, not required
+ifneq ($(CXX),clang++)
+	SITE_CFLAGS += -Wl,--no-as-needed
+endif

vm/Config.freebsd.x86.32

@@ -0,0 +1,2 @@
+include vm/Config.freebsd
+include vm/Config.x86.32

vm/Config.freebsd.x86.64

@@ -0,0 +1,2 @@
+include vm/Config.freebsd
+include vm/Config.x86.64

vm/os-freebsd.hpp

@@ -0,0 +1,3 @@
+#include <sys/syscall.h>
+
+namespace factor {}

vm/platform.hpp

@@ -45,6 +45,21 @@
         #error "Unsupported Linux flavor"
       #endif
     #else
+    #if defined(__freebsd__)
+      #define FACTOR_OS_STRING "freebsd"
+      #include "os-freebsd.hpp"
+
+      #if defined(FACTOR_X86)
+        #include "os-freebsd-x86.32.hpp"
+      #elif defined(FACTOR_ARM)
+        #include "os-freebsd-arm.hpp"
+      #elif defined(FACTOR_AMD64)
+        #include "os-freebsd-x86.64.hpp"
+      #else
+        #error "Unsupported FreeBSD flavor"
+      #endif
+    #else
+
       #error "Unsupported OS"
     #endif
   #endif