1.1 --- a/Config.mk	Mon May 23 14:26:33 2005 +0000
     1.2 +++ b/Config.mk	Mon May 23 15:22:15 2005 +0000
     1.3 @@ -4,12 +4,6 @@
     1.4  XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
     1.5  XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
     1.6  
     1.7 -# Set ARCH/SUBARCH appropriately.
     1.8 -override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH)
     1.9 -override TARGET_SUBARCH  := $(XEN_TARGET_ARCH)
    1.10 -override COMPILE_ARCH    := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH))
    1.11 -override TARGET_ARCH     := $(patsubst x86%,x86,$(XEN_TARGET_ARCH))
    1.12 -
    1.13  # Tools to run on system hosting the build
    1.14  HOSTCC     = gcc
    1.15  HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer 

     2.1 --- a/buildconfigs/mk.linux-2.6-xen0	Mon May 23 14:26:33 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Mon May 23 15:22:15 2005 +0000
     2.3 @@ -33,7 +33,7 @@ build: $(LINUX_DIR)/include/linux/autoco
     2.4  	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     2.5  	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
     2.6  	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
     2.7 -	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
     2.8 +	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
     2.9  		$(LINUX_DIR)/.config
    2.10  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
    2.11  

     3.1 --- a/buildconfigs/mk.linux-2.6-xenU	Mon May 23 14:26:33 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Mon May 23 15:22:15 2005 +0000
     3.3 @@ -33,7 +33,7 @@ build: $(LINUX_DIR)/include/linux/autoco
     3.4  	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     3.5  	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
     3.6  	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
     3.7 -	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
     3.8 +	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
     3.9  		$(LINUX_DIR)/.config
    3.10  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
    3.11  

     4.1 --- a/xen/Rules.mk	Mon May 23 14:26:33 2005 +0000
     4.2 +++ b/xen/Rules.mk	Mon May 23 15:22:15 2005 +0000
     4.3 @@ -10,6 +10,12 @@ crash_debug ?= n
     4.4  
     4.5  include $(BASEDIR)/../Config.mk
     4.6  
     4.7 +# Set ARCH/SUBARCH appropriately.
     4.8 +override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH)
     4.9 +override TARGET_SUBARCH  := $(XEN_TARGET_ARCH)
    4.10 +override COMPILE_ARCH    := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH))
    4.11 +override TARGET_ARCH     := $(patsubst x86%,x86,$(XEN_TARGET_ARCH))
    4.12 +
    4.13  TARGET  := $(BASEDIR)/xen
    4.14  HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)
    4.15  HDRS    += $(wildcard $(BASEDIR)/include/public/*.h)