mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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.
This commit is contained in:
kaf24@viper.(none) committed
1 parent
085a587c38
commit
161acb14dd
6 files changed
+11
-7
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+4
-4
@@ -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)
|
||||
|
||||