[Xen-changelog] [xen-unstable] Fix PAE Mini-OS build.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1172751784 0
# Node ID afed0aeff629c7844cba7b29ec0501faa3946cc2
# Parent  0de2f7d8d89f0bb134f60b5746ae7920503ff50d
Fix PAE Mini-OS build.
Signed-off-by: Grzegorz Milos <gm281@xxxxxxxxx>
---
 extras/mini-os/Makefile          |    3 +--
 extras/mini-os/arch/x86/Makefile |    1 +
 extras/mini-os/arch/x86/arch.mk  |   10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff -r 0de2f7d8d89f -r afed0aeff629 extras/mini-os/Makefile
--- a/extras/mini-os/Makefile   Thu Mar 01 12:14:53 2007 +0000
+++ b/extras/mini-os/Makefile   Thu Mar 01 12:23:04 2007 +0000
@@ -3,8 +3,6 @@
 # Every architecture directory below mini-os/arch has to have a
 # Makefile and a arch.mk.
 #
-
-pae ?= n
 
 XEN_ROOT = ../..
 include $(XEN_ROOT)/Config.mk
@@ -35,6 +33,7 @@ export TARGET_ARCH
 export TARGET_ARCH
 export TARGET_ARCH_DIR
 export TARGET_ARCH_FAM
+export XEN_TARGET_X86_PAE 
 
 # This is used for architecture specific links.
 # This can be overwritten from arch specific rules.
diff -r 0de2f7d8d89f -r afed0aeff629 extras/mini-os/arch/x86/Makefile
--- a/extras/mini-os/arch/x86/Makefile  Thu Mar 01 12:14:53 2007 +0000
+++ b/extras/mini-os/arch/x86/Makefile  Thu Mar 01 12:23:04 2007 +0000
@@ -4,6 +4,7 @@
 #
 
 # include arch.mk has to be before mini-os.mk!
+
 include arch.mk
 include ../../minios.mk
 
diff -r 0de2f7d8d89f -r afed0aeff629 extras/mini-os/arch/x86/arch.mk
--- a/extras/mini-os/arch/x86/arch.mk   Thu Mar 01 12:14:53 2007 +0000
+++ b/extras/mini-os/arch/x86/arch.mk   Thu Mar 01 12:23:04 2007 +0000
@@ -9,13 +9,11 @@ ARCH_ASFLAGS := -m32
 ARCH_ASFLAGS := -m32
 EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH)
 EXTRA_SRC += arch/$(EXTRA_INC)
+
+ifeq ($(XEN_TARGET_X86_PAE),y)
+ARCH_CFLAGS  += -DCONFIG_X86_PAE=1
+ARCH_ASFLAGS += -DCONFIG_X86_PAE=1
 endif
-
-ifeq ($(TARGET_ARCH)$(pae),x86_32y)
-ARCH_CFLAGS  := -DCONFIG_X86_PAE=1
-ARCH_ASFLAGS := -DCONFIG_X86_PAE=1
-EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH)
-EXTRA_SRC += arch/$(EXTRA_INC)
 endif
 
 ifeq ($(TARGET_ARCH),x86_64)

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