aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-08-17 16:48:10 +0100
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-08-17 16:48:10 +0100
commitb7d20cfb9dd9456f0360871e4cc810977eb735ad (patch)
tree24d520e9d9386884323cba021ccaff25f6fa85c2 /config
parentf87e8be01d8ec7968c55959ddc8255c931374fd5 (diff)
parent47e2355fc9bb00b311fd64b01497fce16b6ca522 (diff)
downloadxen-b7d20cfb9dd9456f0360871e4cc810977eb735ad.tar.gz
xen-b7d20cfb9dd9456f0360871e4cc810977eb735ad.tar.bz2
xen-b7d20cfb9dd9456f0360871e4cc810977eb735ad.zip
Merge with ia64/xen-unstable.hg
Diffstat (limited to 'config')
-rw-r--r--config/FreeBSD.mk1
-rw-r--r--config/x86_32.mk8
2 files changed, 4 insertions, 5 deletions
diff --git a/config/FreeBSD.mk b/config/FreeBSD.mk
new file mode 100644
index 0000000000..b421a1c840
--- /dev/null
+++ b/config/FreeBSD.mk
@@ -0,0 +1 @@
+include $(XEN_ROOT)/config/StdGNU.mk
diff --git a/config/x86_32.mk b/config/x86_32.mk
index ce0bb67ba1..9b8cee85b5 100644
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -11,8 +11,6 @@ CFLAGS += -m32 -march=i686
LIBDIR := lib
# Use only if calling $(LD) directly.
-ifeq ($(XEN_OS),OpenBSD)
-LDFLAGS_DIRECT += -melf_i386_obsd
-else
-LDFLAGS_DIRECT += -melf_i386
-endif
+LDFLAGS_DIRECT_OpenBSD = _obsd
+LDFLAGS_DIRECT_FreeBSD = _fbsd
+LDFLAGS_DIRECT += -melf_i386$(LDFLAGS_DIRECT_$(XEN_OS))