[Xen-changelog] Force PAE build of Xen by specifying 'pae=y' to make, or

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 87cfe3f76045d4225a2b626a553c267ef4521890
# Parent  a98634f1c0088a85d23949186c1a22c9ce5d2af3

Force PAE build of Xen by specifying 'pae=y' to make, or
by setting XEN_TARGET_X86_PAE=y (e.g., in Config.mk).
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r a98634f1c008 -r 87cfe3f76045 Makefile
--- a/Makefile  Wed Jul 13 14:37:58 2005
+++ b/Makefile  Wed Jul 13 15:02:49 2005
@@ -30,6 +30,10 @@
 
 include Config.mk
 include buildconfigs/Rules.mk
+
+ifeq ($(XEN_TARGET_X86_PAE),y)
+export pae=y
+endif
 
 .PHONY:        all dist install xen tools kernels docs world clean mkpatches 
mrproper
 .PHONY:        kbuild kdelete kclean
diff -r a98634f1c008 -r 87cfe3f76045 Config.mk
--- a/Config.mk Wed Jul 13 14:37:58 2005
+++ b/Config.mk Wed Jul 13 15:02:49 2005
@@ -3,6 +3,7 @@
 # Currently supported architectures: x86_32, x86_64
 XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
 XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
+XEN_TARGET_X86_PAE  ?= n
 
 # Tools to run on system hosting the build
 HOSTCC     = gcc
diff -r a98634f1c008 -r 87cfe3f76045 xen/arch/x86/Rules.mk
--- a/xen/arch/x86/Rules.mk     Wed Jul 13 14:37:58 2005
+++ b/xen/arch/x86/Rules.mk     Wed Jul 13 15:02:49 2005
@@ -1,5 +1,11 @@
 ########################################
 # x86-specific definitions
+
+#
+# If you change any of these configuration options then you must
+# 'make clean' before rebuilding.
+#
+pae ?= n
 
 CFLAGS  += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
 CFLAGS  += -iwithprefix include -Wall -Werror -Wno-pointer-arith -pipe
@@ -24,6 +30,9 @@
 ifeq ($(TARGET_SUBARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS += -m elf_i386 
+ifeq ($(pae),y)
+CFLAGS  += -DCONFIG_X86_PAE=1
+endif
 endif
 
 ifeq ($(TARGET_SUBARCH),x86_64)
diff -r a98634f1c008 -r 87cfe3f76045 xen/Rules.mk
--- a/xen/Rules.mk      Wed Jul 13 14:37:58 2005
+++ b/xen/Rules.mk      Wed Jul 13 15:02:49 2005
@@ -51,7 +51,6 @@
 endif
 ALL_OBJS += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
 
-
 test-gcc-flag = $(shell $(CC) -v --help 2>&1 | grep -q " $(1) " && echo $(1))
 
 include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
@@ -91,4 +90,3 @@
 
 %.o: %.S $(HDRS) Makefile
        $(CC) $(CFLAGS) -D__ASSEMBLY__ -c $< -o $@
-

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog