ia64/xen-unstable

changeset 3590:48cc820f2cff

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.
author kaf24@viper.(none)
date Sat Jan 29 12:03:44 2005 +0000 (2005-01-29)
parents 0c8d62df84ae
children 96a5638d65e5 b3c74ea53d8a
files BitKeeper/etc/logging_ok buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU linux-2.6.10-xen-sparse/arch/xen/i386/Makefile linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile xen/Rules.mk
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Fri Jan 28 23:19:23 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Sat Jan 29 12:03:44 2005 +0000
     1.3 @@ -32,6 +32,7 @@ kaf24@penguin.local
     1.4  kaf24@plym.cl.cam.ac.uk
     1.5  kaf24@scramble.cl.cam.ac.uk
     1.6  kaf24@striker.cl.cam.ac.uk
     1.7 +kaf24@viper.(none)
     1.8  laudney@eclipse.(none)
     1.9  lynx@idefix.cl.cam.ac.uk
    1.10  mafetter@fleming.research
     2.1 --- a/buildconfigs/mk.linux-2.6-xen0	Fri Jan 28 23:19:23 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Sat Jan 29 12:03:44 2005 +0000
     2.3 @@ -34,7 +34,7 @@ build: $(LINUX_DIR)/include/linux/autoco
     2.4  	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
     2.5  	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
     2.6  		$(LINUX_DIR)/.config
     2.7 -	make -C $(LINUX_DIR) ARCH=xen oldconfig
     2.8 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
     2.9  
    2.10  clean:
    2.11  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
     3.1 --- a/buildconfigs/mk.linux-2.6-xenU	Fri Jan 28 23:19:23 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Sat Jan 29 12:03:44 2005 +0000
     3.3 @@ -34,7 +34,7 @@ build: $(LINUX_DIR)/include/linux/autoco
     3.4  	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
     3.5  	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
     3.6  		$(LINUX_DIR)/.config
     3.7 -	make -C $(LINUX_DIR) ARCH=xen oldconfig
     3.8 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
     3.9  
    3.10  clean:
    3.11  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
     4.1 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/Makefile	Fri Jan 28 23:19:23 2005 +0000
     4.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/Makefile	Sat Jan 29 12:03:44 2005 +0000
     4.3 @@ -21,6 +21,9 @@ LDFLAGS		:= -m elf_i386
     4.4  LDFLAGS_vmlinux :=
     4.5  CHECK		:= $(CHECK) -D__i386__=1
     4.6  
     4.7 +CFLAGS += -m32
     4.8 +AFLAGS += -m32
     4.9 +
    4.10  CFLAGS += -pipe -msoft-float
    4.11  
    4.12  # prevent gcc from keeping the stack 16 byte aligned
     5.1 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile	Fri Jan 28 23:19:23 2005 +0000
     5.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile	Sat Jan 29 12:03:44 2005 +0000
     5.3 @@ -54,7 +54,7 @@ targets += $(foreach F,int80 sysenter,vs
     5.4  
     5.5  # The DSO images are built using a special linker script.
     5.6  quiet_cmd_syscall = SYSCALL $@
     5.7 -      cmd_syscall = $(CC) -nostdlib $(SYSCFLAGS_$(@F)) \
     5.8 +      cmd_syscall = $(CC) -nostdlib -m32 $(SYSCFLAGS_$(@F)) \
     5.9  		          -Wl,-T,$(filter-out FORCE,$^) -o $@
    5.10  
    5.11  vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1
     6.1 --- a/xen/Rules.mk	Fri Jan 28 23:19:23 2005 +0000
     6.2 +++ b/xen/Rules.mk	Sat Jan 29 12:03:44 2005 +0000
     6.3 @@ -11,10 +11,10 @@ COMPILE_ARCH    ?= $(shell uname -m | se
     6.4  TARGET_ARCH     ?= $(COMPILE_ARCH)
     6.5  
     6.6  # Set ARCH/SUBARCH appropriately.
     6.7 -COMPILE_SUBARCH := $(COMPILE_ARCH)
     6.8 -TARGET_SUBARCH  := $(COMPILE_ARCH)
     6.9 -COMPILE_ARCH    := $(patsubst x86%,x86,$(COMPILE_ARCH))
    6.10 -TARGET_ARCH     := $(patsubst x86%,x86,$(TARGET_ARCH))
    6.11 +override COMPILE_SUBARCH := $(COMPILE_ARCH)
    6.12 +override TARGET_SUBARCH  := $(TARGET_ARCH)
    6.13 +override COMPILE_ARCH    := $(patsubst x86%,x86,$(COMPILE_ARCH))
    6.14 +override TARGET_ARCH     := $(patsubst x86%,x86,$(TARGET_ARCH))
    6.15  
    6.16  TARGET  := $(BASEDIR)/xen
    6.17  HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)