ia64/xen-unstable

changeset 3952:5c98a123eb05

bitkeeper revision 1.1236.1.38 (42221634EYMEOeOSyYh0c2ti_q6P0w)

Merge planb.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into planb.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-unstable.bk
author kaf24@planb.cl.cam.ac.uk
date Sun Feb 27 18:49:24 2005 +0000 (2005-02-27)
parents 1287a4b3e6c3 4d71c8e12d6f
children 4202d86eff9f
files Makefile tools/Rules.mk xen/Rules.mk
line diff
     1.1 --- a/Makefile	Sun Feb 27 17:49:45 2005 +0000
     1.2 +++ b/Makefile	Sun Feb 27 18:49:24 2005 +0000
     1.3 @@ -22,9 +22,9 @@ XKERNELS := $(foreach kernel, $(KERNELS)
     1.4  export DESTDIR
     1.5  
     1.6  # Export target architecture overrides to Xen and Linux sub-trees.
     1.7 -ifneq ($(TARGET_ARCH),)
     1.8 -SUBARCH := $(subst x86_32,i386,$(TARGET_ARCH))
     1.9 -export TARGET_ARCH SUBARCH
    1.10 +ifneq ($(XEN_TARGET_ARCH),)
    1.11 +SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH))
    1.12 +export XEN_TARGET_ARCH SUBARCH
    1.13  endif
    1.14  
    1.15  include buildconfigs/Rules.mk
     2.1 --- a/tools/Rules.mk	Sun Feb 27 17:49:45 2005 +0000
     2.2 +++ b/tools/Rules.mk	Sun Feb 27 18:49:24 2005 +0000
     2.3 @@ -4,15 +4,15 @@ XEN_XC             = $(XEN_ROOT)/tools/p
     2.4  XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
     2.5  XEN_LIBXUTIL       = $(XEN_ROOT)/tools/libxutil
     2.6  
     2.7 -COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
     2.8 -TARGET_ARCH     ?= $(COMPILE_ARCH)
     2.9 +XEN_COMPILE_ARCH  ?= $(shell uname -m | sed -e s/i.86/x86_32/)
    2.10 +XEN_TARGET_ARCH   ?= $(XEN_COMPILE_ARCH)
    2.11  
    2.12 -ifeq ($(TARGET_ARCH),x86_32)
    2.13 +ifeq ($(XEN_TARGET_ARCH),x86_32)
    2.14  CFLAGS  += -m32 -march=i686
    2.15  LDFLAGS += -m elf_i386
    2.16  endif
    2.17  
    2.18 -ifeq ($(TARGET_ARCH),x86_64)
    2.19 +ifeq ($(XEN_TARGET_ARCH),x86_64)
    2.20  CFLAGS  += -m64
    2.21  LDFLAGS += -m elf_x86_64
    2.22  endif
     3.1 --- a/xen/Rules.mk	Sun Feb 27 17:49:45 2005 +0000
     3.2 +++ b/xen/Rules.mk	Sun Feb 27 18:49:24 2005 +0000
     3.3 @@ -7,14 +7,14 @@ optimize    ?= y
     3.4  crash_debug ?= n
     3.5  
     3.6  # Currently supported architectures: x86_32, x86_64
     3.7 -COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
     3.8 -TARGET_ARCH     ?= $(COMPILE_ARCH)
     3.9 +XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
    3.10 +XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
    3.11  
    3.12  # Set ARCH/SUBARCH appropriately.
    3.13 -override COMPILE_SUBARCH := $(COMPILE_ARCH)
    3.14 -override TARGET_SUBARCH  := $(TARGET_ARCH)
    3.15 -override COMPILE_ARCH    := $(patsubst x86%,x86,$(COMPILE_ARCH))
    3.16 -override TARGET_ARCH     := $(patsubst x86%,x86,$(TARGET_ARCH))
    3.17 +override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH)
    3.18 +override TARGET_SUBARCH  := $(XEN_TARGET_ARCH)
    3.19 +override COMPILE_ARCH    := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH))
    3.20 +override TARGET_ARCH     := $(patsubst x86%,x86,$(XEN_TARGET_ARCH))
    3.21  
    3.22  TARGET  := $(BASEDIR)/xen
    3.23  HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)