ia64/xen-unstable

changeset 5769:87cfe3f76045

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@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Jul 13 15:02:49 2005 +0000 (2005-07-13)
parents a98634f1c008
children 57b2fa8bf11d
files Config.mk Makefile xen/Rules.mk xen/arch/x86/Rules.mk
line diff
     1.1 --- a/Config.mk	Wed Jul 13 14:37:58 2005 +0000
     1.2 +++ b/Config.mk	Wed Jul 13 15:02:49 2005 +0000
     1.3 @@ -3,6 +3,7 @@
     1.4  # Currently supported architectures: x86_32, x86_64
     1.5  XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
     1.6  XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
     1.7 +XEN_TARGET_X86_PAE  ?= n
     1.8  
     1.9  # Tools to run on system hosting the build
    1.10  HOSTCC     = gcc
     2.1 --- a/Makefile	Wed Jul 13 14:37:58 2005 +0000
     2.2 +++ b/Makefile	Wed Jul 13 15:02:49 2005 +0000
     2.3 @@ -31,6 +31,10 @@ all: dist
     2.4  include Config.mk
     2.5  include buildconfigs/Rules.mk
     2.6  
     2.7 +ifeq ($(XEN_TARGET_X86_PAE),y)
     2.8 +export pae=y
     2.9 +endif
    2.10 +
    2.11  .PHONY:	all dist install xen tools kernels docs world clean mkpatches mrproper
    2.12  .PHONY:	kbuild kdelete kclean
    2.13  
     3.1 --- a/xen/Rules.mk	Wed Jul 13 14:37:58 2005 +0000
     3.2 +++ b/xen/Rules.mk	Wed Jul 13 15:02:49 2005 +0000
     3.3 @@ -51,7 +51,6 @@ ALL_OBJS += $(BASEDIR)/acm/acm.o
     3.4  endif
     3.5  ALL_OBJS += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
     3.6  
     3.7 -
     3.8  test-gcc-flag = $(shell $(CC) -v --help 2>&1 | grep -q " $(1) " && echo $(1))
     3.9  
    3.10  include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
    3.11 @@ -91,4 +90,3 @@ CFLAGS := $(strip $(CFLAGS))
    3.12  
    3.13  %.o: %.S $(HDRS) Makefile
    3.14  	$(CC) $(CFLAGS) -D__ASSEMBLY__ -c $< -o $@
    3.15 -
     4.1 --- a/xen/arch/x86/Rules.mk	Wed Jul 13 14:37:58 2005 +0000
     4.2 +++ b/xen/arch/x86/Rules.mk	Wed Jul 13 15:02:49 2005 +0000
     4.3 @@ -1,6 +1,12 @@
     4.4  ########################################
     4.5  # x86-specific definitions
     4.6  
     4.7 +#
     4.8 +# If you change any of these configuration options then you must
     4.9 +# 'make clean' before rebuilding.
    4.10 +#
    4.11 +pae ?= n
    4.12 +
    4.13  CFLAGS  += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
    4.14  CFLAGS  += -iwithprefix include -Wall -Werror -Wno-pointer-arith -pipe
    4.15  CFLAGS  += -I$(BASEDIR)/include 
    4.16 @@ -24,6 +30,9 @@ CFLAGS  += $(call test-gcc-flag,-fno-sta
    4.17  ifeq ($(TARGET_SUBARCH),x86_32)
    4.18  CFLAGS  += -m32 -march=i686
    4.19  LDFLAGS += -m elf_i386 
    4.20 +ifeq ($(pae),y)
    4.21 +CFLAGS  += -DCONFIG_X86_PAE=1
    4.22 +endif
    4.23  endif
    4.24  
    4.25  ifeq ($(TARGET_SUBARCH),x86_64)