bitkeeper revision 1.1159.223.52 (41fb7ba0KYbuQ5SmW1MZjMO0P-RCew)

Small build fixes. Xen and XenLinux now build for x86_32 from within an
x86_64 build environment if you set TARGET_ARCH=x86_32.

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index a5aabc0fcf54ea1150c2490d3c40cd81a9c8aa10..f2a27dc63d84a86d2ff49c48492459e9fac8ee99 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -32,6 +32,7 @@ kaf24@penguin.local
 kaf24@plym.cl.cam.ac.uk
 kaf24@scramble.cl.cam.ac.uk
 kaf24@striker.cl.cam.ac.uk
+kaf24@viper.(none)
 laudney@eclipse.(none)
 lynx@idefix.cl.cam.ac.uk
 mafetter@fleming.research

diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index f4310f5925a0cc86f8df6f7d028df4b126c3b5c7..5685eb3e128155fbe504ef0fc4fa1def47dfac08 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -34,7 +34,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
          cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
                $(LINUX_DIR)/.config
-       make -C $(LINUX_DIR) ARCH=xen oldconfig
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
 
 clean:
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean

diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index 79a3d66777d67f13f70acc2e7f44ce59f9657abc..1e5bbd4f372c863194159d65c331c4db15fcf399 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -34,7 +34,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
          cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
                $(LINUX_DIR)/.config
-       make -C $(LINUX_DIR) ARCH=xen oldconfig
+       $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
 
 clean:
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean

diff --git a/linux-2.6.10-xen-sparse/arch/xen/i386/Makefile b/linux-2.6.10-xen-sparse/arch/xen/i386/Makefile
index bbfbab8a54291ba9848e77c89943c85dbb79416e..8af105985308a3fe8508664d1a2cbb4da78c2c06 100644 (file)
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/Makefile
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/Makefile
@@ -21,6 +21,9 @@ LDFLAGS               := -m elf_i386
 LDFLAGS_vmlinux :=
 CHECK          := $(CHECK) -D__i386__=1
 
+CFLAGS += -m32
+AFLAGS += -m32
+
 CFLAGS += -pipe -msoft-float
 
 # prevent gcc from keeping the stack 16 byte aligned

diff --git a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
index c304fbb0cd850eff697be77ca848ab1731dfdbcc..522bab987af6c2204414136ef8eee7bff4a1e459 100644 (file)
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
@@ -54,7 +54,7 @@ targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
 
 # The DSO images are built using a special linker script.
 quiet_cmd_syscall = SYSCALL $@
-      cmd_syscall = $(CC) -nostdlib $(SYSCFLAGS_$(@F)) \
+      cmd_syscall = $(CC) -nostdlib -m32 $(SYSCFLAGS_$(@F)) \
                          -Wl,-T,$(filter-out FORCE,$^) -o $@
 
 vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1

diff --git a/xen/Rules.mk b/xen/Rules.mk
index cf6972f0975e9dc85bf910b9100ebf701fd10228..82599afec0056adbfadb93b40741f56b416b192f 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -11,10 +11,10 @@ COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
 TARGET_ARCH     ?= $(COMPILE_ARCH)
 
 # 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))
+override COMPILE_SUBARCH := $(COMPILE_ARCH)
+override TARGET_SUBARCH  := $(TARGET_ARCH)
+override COMPILE_ARCH    := $(patsubst x86%,x86,$(COMPILE_ARCH))
+override TARGET_ARCH     := $(patsubst x86%,x86,$(TARGET_ARCH))
 
 TARGET  := $(BASEDIR)/xen
 HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)