# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID be8039f8bc147f419820839f71c68011704a0d1f
# Parent fb9f7ac2fc542b74b0dd5f943c65cba9c44350be
Introduce Makefile config fragments for OS-specific differences.
Signed-off-by: John Levon <john.levon@xxxxxxx>
---
Config.mk | 39 +++++++++------------------------------
Makefile | 5 -----
buildconfigs/Rules.mk | 3 +++
config/Linux.mk | 34 ++++++++++++++++++++++++++++++++++
config/SunOS.mk | 27 +++++++++++++++++++++++++++
config/x86_64.mk | 2 +-
xen/Rules.mk | 6 ++++--
7 files changed, 78 insertions(+), 38 deletions(-)
diff -r fb9f7ac2fc54 -r be8039f8bc14 Config.mk
--- a/Config.mk Tue Oct 17 16:13:13 2006 +0100
+++ b/Config.mk Tue Oct 17 16:48:05 2006 +0100
@@ -4,43 +4,19 @@ debug ?= n
debug ?= n
XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/ \
- -e s/ppc/powerpc/)
+ -e s/ppc/powerpc/ -e s/i86pc/x86_32/)
XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH)
XEN_TARGET_X86_PAE ?= n
+XEN_OS ?= $(shell uname -s)
# Tools to run on system hosting the build
HOSTCC = gcc
HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-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
-
DISTDIR ?= $(XEN_ROOT)/dist
DESTDIR ?= /
-INSTALL = install
-INSTALL_DIR = $(INSTALL) -d -m0755
-INSTALL_DATA = $(INSTALL) -m0644
-INSTALL_PROG = $(INSTALL) -m0755
-
-ifneq ($(debug),y)
-# Optimisation flags are overridable
-CFLAGS ?= -O2 -fomit-frame-pointer
-CFLAGS += -DNDEBUG
-else
-# Less than -O1 produces bad code and large stack frames
-CFLAGS ?= -O1 -fno-omit-frame-pointer
-CFLAGS += -g
-endif
-
+include $(XEN_ROOT)/config/$(XEN_OS).mk
include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
ifneq ($(EXTRA_PREFIX),)
@@ -49,6 +25,12 @@ endif
endif
test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2))
+
+ifneq ($(debug),y)
+CFLAGS += -DNDEBUG
+else
+CFLAGS += -g
+endif
CFLAGS += -Wall -Wstrict-prototypes
@@ -61,9 +43,6 @@ CFLAGS += $(call test-gcc-flag,$(CC)
LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i))
CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
-
-# Choose the best mirror to download linux kernel
-KERNEL_REPO = http://www.kernel.org
# If ACM_SECURITY = y, then the access control module is compiled
# into Xen and the policy type can be set by the boot policy file
diff -r fb9f7ac2fc54 -r be8039f8bc14 Makefile
--- a/Makefile Tue Oct 17 16:13:13 2006 +0100
+++ b/Makefile Tue Oct 17 16:48:05 2006 +0100
@@ -1,11 +1,6 @@
#
# Grand Unified Makefile for Xen.
#
-
-KERNELS ?= linux-2.6-xen
-# You may use wildcards in the above e.g. KERNELS=*2.6*
-
-XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst
buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
# Export target architecture overrides to Xen and Linux sub-trees.
ifneq ($(XEN_TARGET_ARCH),)
diff -r fb9f7ac2fc54 -r be8039f8bc14 buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk Tue Oct 17 16:13:13 2006 +0100
+++ b/buildconfigs/Rules.mk Tue Oct 17 16:48:05 2006 +0100
@@ -2,6 +2,9 @@ include Config.mk
include Config.mk
export DESTDIR
+
+# Choose the best mirror to download linux kernel
+KERNEL_REPO = http://www.kernel.org
ALLKERNELS = $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.*))
ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
diff -r fb9f7ac2fc54 -r be8039f8bc14 config/x86_64.mk
--- a/config/x86_64.mk Tue Oct 17 16:13:13 2006 +0100
+++ b/config/x86_64.mk Tue Oct 17 16:48:05 2006 +0100
@@ -6,4 +6,4 @@ CONFIG_IOEMU := y
CFLAGS += -m64
LDFLAGS += -m64
-LIBDIR = lib64
+LIBDIR = $(LIB64DIR)
diff -r fb9f7ac2fc54 -r be8039f8bc14 xen/Rules.mk
--- a/xen/Rules.mk Tue Oct 17 16:13:13 2006 +0100
+++ b/xen/Rules.mk Tue Oct 17 16:48:05 2006 +0100
@@ -24,9 +24,11 @@ override COMPILE_SUBARCH := $(XEN_COMPIL
override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH)
override TARGET_SUBARCH := $(XEN_TARGET_ARCH)
override COMPILE_ARCH := $(shell echo $(XEN_COMPILE_ARCH) | \
- sed -e 's/\(x86\|powerpc\).*/\1/')
+ sed -e 's/x86.*/x86/' \
+ -e 's/powerpc.*/powerpc/')
override TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \
- sed -e 's/\(x86\|powerpc\).*/\1/')
+ sed -e 's/x86.*/x86/' \
+ -e 's/powerpc.*/powerpc/')
TARGET := $(BASEDIR)/xen
diff -r fb9f7ac2fc54 -r be8039f8bc14 config/Linux.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/config/Linux.mk Tue Oct 17 16:48:05 2006 +0100
@@ -0,0 +1,34 @@
+# -*- 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
+
+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
+
+# You may use wildcards, e.g. KERNELS=*2.6*
+KERNELS ?= linux-2.6-xen
+
+XKERNELS := $(foreach kernel, $(KERNELS), \
+ $(patsubst buildconfigs/mk.%,%, \
+ $(wildcard buildconfigs/mk.$(kernel))) )
diff -r fb9f7ac2fc54 -r be8039f8bc14 config/SunOS.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/config/SunOS.mk Tue Oct 17 16:48:05 2006 +0100
@@ -0,0 +1,27 @@
+# -*- mode: Makefile; -*-
+
+AS = $(CROSS_COMPILE)gas
+LD = $(CROSS_COMPILE)gld
+CC = $(CROSS_COMPILE)gcc
+CPP = $(CROSS_COMPILE)gcc -E
+AR = $(CROSS_COMPILE)gar
+RANLIB = $(CROSS_COMPILE)granlib
+NM = $(CROSS_COMPILE)gnm
+STRIP = $(CROSS_COMPILE)gstrip
+OBJCOPY = $(CROSS_COMPILE)gobjcopy
+OBJDUMP = $(CROSS_COMPILE)gobjdump
+
+INSTALL = ginstall
+INSTALL_DIR = $(INSTALL) -d -m0755
+INSTALL_DATA = $(INSTALL) -m0644
+INSTALL_PROG = $(INSTALL) -m0755
+
+LIB64DIR = lib/amd64
+
+ifneq ($(debug),y)
+# Optimisation flags are overridable
+CFLAGS ?= -O2 -fno-omit-frame-pointer
+else
+# Less than -O1 produces bad code and large stack frames
+CFLAGS ?= -O1 -fno-omit-frame-pointer
+endif
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home