From 3da32f9dafe6016decb9ebbad008cca6fab818ca Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Thu, 15 Aug 2013 16:38:25 +0100 Subject: xen/x86: hypervisor build fixes for FreeBSD. These allow an x86_64 hypervisor to build on FreeBSD 9.1/amd64. - like OpenBSD, needs a different arch passed to ld. - like OpenBSD, stdarg.h and stdbool.h are in /usr/include. Signed-off-by: Tim Deegan Acked-by: Keir Fraser --- config/x86_64.mk | 4 ++++ xen/include/xen/stdarg.h | 2 +- xen/include/xen/stdbool.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/x86_64.mk b/config/x86_64.mk index 70c0d8d47e..d925b23770 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -20,5 +20,9 @@ EFI_DIR ?= /usr/lib64/efi ifeq ($(XEN_OS),OpenBSD) LDFLAGS_DIRECT += -melf_x86_64_obsd else +ifeq ($(XEN_OS),FreeBSD) +LDFLAGS_DIRECT += -melf_x86_64_fbsd +else LDFLAGS_DIRECT += -melf_x86_64 endif +endif diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h index ade7a658d9..d1b25402b7 100644 --- a/xen/include/xen/stdarg.h +++ b/xen/include/xen/stdarg.h @@ -1,7 +1,7 @@ #ifndef __XEN_STDARG_H__ #define __XEN_STDARG_H__ -#if defined(__OpenBSD__) || defined (__NetBSD__) +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) typedef __builtin_va_list va_list; # ifdef __GNUC__ # define __GNUC_PREREQ__(x, y) \ diff --git a/xen/include/xen/stdbool.h b/xen/include/xen/stdbool.h index 2eecd52a18..f0faedfd3d 100644 --- a/xen/include/xen/stdbool.h +++ b/xen/include/xen/stdbool.h @@ -1,7 +1,7 @@ #ifndef __XEN_STDBOOL_H__ #define __XEN_STDBOOL_H__ -#if defined(__OpenBSD__) || defined(__NetBSD__) +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) # define bool _Bool # define true 1 # define false 0 -- cgit v1.2.3