diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen0 | 2 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xenU | 2 | ||||
| -rw-r--r-- | linux-2.6.10-xen-sparse/arch/xen/i386/Makefile | 3 | ||||
| -rw-r--r-- | linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile | 2 | ||||
| -rw-r--r-- | xen/Rules.mk | 8 |
6 files changed, 11 insertions, 7 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index a5aabc0fcf..f2a27dc63d 100644 --- 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 f4310f5925..5685eb3e12 100644 --- 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 79a3d66777..1e5bbd4f37 100644 --- 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 bbfbab8a54..8af1059853 100644 --- 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 c304fbb0cd..522bab987a 100644 --- 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 cf6972f097..82599afec0 100644 --- 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) |