diff -r bd207697f0c7 xen/arch/x86/Rules.mk
--- a/xen/arch/x86/Rules.mk	Wed Oct 18 13:43:35 2006 +0100
+++ b/xen/arch/x86/Rules.mk	Tue Oct 17 16:20:45 2006 +0200
@@ -34,7 +34,7 @@ endif
 endif
 
 ifeq ($(XEN_TARGET_ARCH),x86_32)
-LDFLAGS += -m elf_i386
+LDFLAGS += -m $(ELFFMT_X86_32) 
 x86_32 := y
 x86_64 := n
 endif
@@ -45,7 +45,7 @@ CFLAGS  += -fno-asynchronous-unwind-tabl
 # -fvisibility=hidden reduces -fpic cost, if it's available
 CFLAGS  += $(shell $(CC) -v --help 2>&1 | grep " -fvisibility=" | \
              grep -q hidden && echo "-DGCC_HAS_VISIBILITY_ATTRIBUTE")
-LDFLAGS += -m elf_x86_64
+LDFLAGS += -m $(ELFFMT_X86_64) 
 x86_32 := n
 x86_64 := y
 endif
diff -r bd207697f0c7 config/Linux.mk
--- a/config/Linux.mk	Wed Oct 18 13:43:35 2006 +0100
+++ b/config/Linux.mk	Tue Oct 17 16:20:45 2006 +0200
@@ -31,6 +31,9 @@ CFLAGS ?= -O1 -fno-omit-frame-pointer
 CFLAGS ?= -O1 -fno-omit-frame-pointer
 endif
 
+ELFFMT_X86_32 = elf_i386
+ELFFMT_X86_64 = elf_x86_64
+
 # You may use wildcards, e.g. KERNELS=*2.6*
 KERNELS ?= linux-2.6-xen
 
diff -r bd207697f0c7 config/SunOS.mk
--- a/config/SunOS.mk	Wed Oct 18 13:43:35 2006 +0100
+++ b/config/SunOS.mk	Tue Oct 17 16:20:45 2006 +0200
@@ -34,3 +34,6 @@ endif
 endif
 
 CFLAGS += -Wa,--divide
+
+ELFFMT_X86_32 = elf_i386
+ELFFMT_X86_64 = elf_x86_64
diff -r bd207697f0c7 config/OpenBSD.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/OpenBSD.mk	Tue Oct 17 16:20:45 2006 +0200
@@ -0,0 +1,35 @@
+# -*- mode: Makefile; -*-
+
+AS         = $(CROSS_COMPILE)as
+LD         = $(CROSS_COMPILE)ld
+CC         = $(CROSS_COMPILE)gcc
+CPP        = $(CROSS_COMPILE)gcc -E
+AR         = $(CROSS_COMPILE)ar
+RANLIB     = $(CROSS_COMPILE)ranlib
+NM         = $(CROSS_COMPILE)nm
+STRIP      = $(CROSS_COMPILE)strip
+OBJCOPY    = $(CROSS_COMPILE)objcopy
+OBJDUMP    = $(CROSS_COMPILE)objdump
+
+INSTALL      = install
+INSTALL_DIR  = $(INSTALL) -d -m0755
+INSTALL_DATA = $(INSTALL) -m0644
+INSTALL_PROG = $(INSTALL) -m0755
+
+LIB64DIR = lib64
+
+SOCKET_LIBS =
+CURSES_LIBS = -lncurses
+SONAME_LDFLAG = -soname
+SHLIB_CFLAGS = -shared
+
+ifneq ($(debug),y)
+# Optimisation flags are overridable
+CFLAGS ?= -O2 -fomit-frame-pointer
+else
+# Less than -O1 produces bad code and large stack frames
+CFLAGS ?= -O1 -fno-omit-frame-pointer
+endif
+
+ELFFMT_X86_32 = elf_i386_obsd
+ELFFMT_X86_64 = elf_x86_64_obsd