ia64/xen-unstable

changeset 3551:c0a40bca3258

bitkeeper revision 1.1159.223.45 (41f8f049ZJjSGVQ7S0Y7kGBwMIZfZQ)

No longer override target arch with ARCH but instead use TARGET_ARCH.
Xen now requires specification of TARGET_ARCH alone, not TARGET_ARCH
and TARGET_SUBARCH. Xen derives correct internal ARCH/SUBARCH components
automatically.
author kaf24@scramble.cl.cam.ac.uk
date Thu Jan 27 13:44:41 2005 +0000 (2005-01-27)
parents dca8a77a487d
children f20cf55e3557 507df0ffa68f
files Makefile tools/Rules.mk xen/Rules.mk
line diff
     1.1 --- a/Makefile	Thu Jan 27 10:53:38 2005 +0000
     1.2 +++ b/Makefile	Thu Jan 27 13:44:41 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 ($(ARCH),)
     1.8 -export TARGET_SUBARCH := $(ARCH)
     1.9 -export SUBARCH        := $(subst x86_32,i386,$(ARCH))
    1.10 +ifneq ($(TARGET_ARCH),)
    1.11 +SUBARCH := $(subst x86_32,i386,$(ARCH))
    1.12 +export TARGET_ARCH SUBARCH
    1.13  endif
    1.14  
    1.15  include buildconfigs/Rules.mk
    1.16 @@ -42,8 +42,8 @@ install: xen checked-tools kernels docs
    1.17  
    1.18  # Only check for install req'mts on 'make install', not on 'make dist'.
    1.19  checked-tools:
    1.20 -	$(MAKE) ARCH=$(ARCH) -C tools/check install
    1.21 -	$(MAKE) ARCH=$(ARCH) -C tools install
    1.22 +	$(MAKE) -C tools/check install
    1.23 +	$(MAKE) -C tools install
    1.24  
    1.25  # build and install everything into local dist directory
    1.26  dist: xen tools kernels docs
    1.27 @@ -57,7 +57,7 @@ xen:
    1.28  	$(MAKE) -C xen install
    1.29  
    1.30  tools:
    1.31 -	$(MAKE) ARCH=$(ARCH) -C tools install
    1.32 +	$(MAKE) -C tools install
    1.33  
    1.34  kernels:
    1.35  	for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
    1.36 @@ -92,7 +92,7 @@ world:
    1.37  # clean doesn't do a kclean
    1.38  clean: 
    1.39  	$(MAKE) -C xen clean
    1.40 -	$(MAKE) ARCH=$(ARCH) -C tools clean
    1.41 +	$(MAKE) -C tools clean
    1.42  	$(MAKE) -C docs clean
    1.43  
    1.44  # clean, but blow away kernel build tree plus tar balls
     2.1 --- a/tools/Rules.mk	Thu Jan 27 10:53:38 2005 +0000
     2.2 +++ b/tools/Rules.mk	Thu Jan 27 13:44:41 2005 +0000
     2.3 @@ -4,12 +4,12 @@ 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 -ifeq ($(ARCH),x86_32)
     2.8 +ifeq ($(TARGET_ARCH),x86_32)
     2.9  CFLAGS  += -m32 -march=i686
    2.10  LDFLAGS += -m elf_i386
    2.11  endif
    2.12  
    2.13 -ifeq ($(ARCH),x86_64)
    2.14 +ifeq ($(TARGET_ARCH),x86_64)
    2.15  CFLAGS  += -m64
    2.16  LDFLAGS += -m elf_x86_64
    2.17  endif
     3.1 --- a/xen/Rules.mk	Thu Jan 27 10:53:38 2005 +0000
     3.2 +++ b/xen/Rules.mk	Thu Jan 27 13:44:41 2005 +0000
     3.3 @@ -6,14 +6,15 @@ perfc       ?= n
     3.4  trace       ?= n
     3.5  optimize    ?= y
     3.6  
     3.7 -# Currently supported architectures:
     3.8 -#  {COMPILE,TARGET}_ARCH    := x86
     3.9 -#  {COMPILE,TARGET}_SUBARCH := x86_32 | x86_64
    3.10 -COMPILE_ARCH    := x86
    3.11 -COMPILE_SUBARCH := $(shell uname -m | sed -e s/i.86/x86_32/)
    3.12 +# Currently supported architectures: x86_32, x86_64
    3.13 +COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
    3.14 +TARGET_ARCH     ?= $(COMPILE_ARCH)
    3.15  
    3.16 -TARGET_ARCH     ?= $(COMPILE_ARCH)
    3.17 -TARGET_SUBARCH  ?= $(COMPILE_SUBARCH)
    3.18 +# Set ARCH/SUBARCH appropriately.
    3.19 +COMPILE_SUBARCH := $(COMPILE_ARCH)
    3.20 +TARGET_SUBARCH  := $(COMPILE_ARCH)
    3.21 +COMPILE_ARCH    := $(patsubst x86%,x86,$(COMPILE_ARCH))
    3.22 +TARGET_ARCH     := $(patsubst x86%,x86,$(TARGET_ARCH))
    3.23  
    3.24  TARGET  := $(BASEDIR)/xen
    3.25  HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)