diff options
| author | Tim Deegan <tim@xen.org> | 2013-08-15 16:38:25 +0100 |
|---|---|---|
| committer | Tim Deegan <tim@xen.org> | 2013-08-16 18:28:36 +0100 |
| commit | 3da32f9dafe6016decb9ebbad008cca6fab818ca (patch) | |
| tree | 45a3909815c0a3369c779b025fe7ba1e8ac497e9 | |
| parent | 1e30327eeb08420e75f6296aac0625f361948028 (diff) | |
| download | xen-3da32f9dafe6016decb9ebbad008cca6fab818ca.tar.gz xen-3da32f9dafe6016decb9ebbad008cca6fab818ca.tar.bz2 xen-3da32f9dafe6016decb9ebbad008cca6fab818ca.zip | |
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 <tim@xen.org>
Acked-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | config/x86_64.mk | 4 | ||||
| -rw-r--r-- | xen/include/xen/stdarg.h | 2 | ||||
| -rw-r--r-- | 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 |