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.

diff --git a/Makefile b/Makefile
index 094acb7fe40c806bee6ae6e4108b636d77ec1e91..73098aa3dda1b4f0c88c80e266a20003ff3ce11a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@ XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildc
 export DESTDIR
 
 # Export target architecture overrides to Xen and Linux sub-trees.
-ifneq ($(ARCH),)
-export TARGET_SUBARCH := $(ARCH)
-export SUBARCH        := $(subst x86_32,i386,$(ARCH))
+ifneq ($(TARGET_ARCH),)
+SUBARCH := $(subst x86_32,i386,$(ARCH))
+export TARGET_ARCH SUBARCH
 endif
 
 include buildconfigs/Rules.mk
@@ -42,8 +42,8 @@ install: xen checked-tools kernels docs
 
 # Only check for install req'mts on 'make install', not on 'make dist'.
 checked-tools:
-       $(MAKE) ARCH=$(ARCH) -C tools/check install
-       $(MAKE) ARCH=$(ARCH) -C tools install
+       $(MAKE) -C tools/check install
+       $(MAKE) -C tools install
 
 # build and install everything into local dist directory
 dist: xen tools kernels docs
@@ -57,7 +57,7 @@ xen:
        $(MAKE) -C xen install
 
 tools:
-       $(MAKE) ARCH=$(ARCH) -C tools install
+       $(MAKE) -C tools install
 
 kernels:
        for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
@@ -92,7 +92,7 @@ world:
 # clean doesn't do a kclean
 clean: 
        $(MAKE) -C xen clean
-       $(MAKE) ARCH=$(ARCH) -C tools clean
+       $(MAKE) -C tools clean
        $(MAKE) -C docs clean
 
 # clean, but blow away kernel build tree plus tar balls

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 2876c7eb61a30d4d9ff3fff790ae70c804fd896f..2666f438425dc21666fea98da47edfd9ac80bbc5 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -4,12 +4,12 @@ XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 XEN_LIBXUTIL       = $(XEN_ROOT)/tools/libxutil
 
-ifeq ($(ARCH),x86_32)
+ifeq ($(TARGET_ARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS += -m elf_i386
 endif
 
-ifeq ($(ARCH),x86_64)
+ifeq ($(TARGET_ARCH),x86_64)
 CFLAGS  += -m64
 LDFLAGS += -m elf_x86_64
 endif

diff --git a/xen/Rules.mk b/xen/Rules.mk
index c5d34057819b7148f4b22ae9df153e6f3df60128..cf6972f0975e9dc85bf910b9100ebf701fd10228 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -6,14 +6,15 @@ perfc       ?= n
 trace       ?= n
 optimize    ?= y
 
-# Currently supported architectures:
-#  {COMPILE,TARGET}_ARCH    := x86
-#  {COMPILE,TARGET}_SUBARCH := x86_32 | x86_64
-COMPILE_ARCH    := x86
-COMPILE_SUBARCH := $(shell uname -m | sed -e s/i.86/x86_32/)
-
+# Currently supported architectures: x86_32, x86_64
+COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
 TARGET_ARCH     ?= $(COMPILE_ARCH)
-TARGET_SUBARCH  ?= $(COMPILE_SUBARCH)
+
+# Set ARCH/SUBARCH appropriately.
+COMPILE_SUBARCH := $(COMPILE_ARCH)
+TARGET_SUBARCH  := $(COMPILE_ARCH)
+COMPILE_ARCH    := $(patsubst x86%,x86,$(COMPILE_ARCH))
+TARGET_ARCH     := $(patsubst x86%,x86,$(TARGET_ARCH))
 
 TARGET  := $(BASEDIR)/xen
 HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)