diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-04-01 10:49:42 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-04-01 10:49:42 +0100 |
| commit | 85c024b331ec621ac4761812392bb08614a2e163 (patch) | |
| tree | 4d29e1a035ee8ae32195aaa13c4b436d5d6d0d4e | |
| parent | 75a5d014e3899c4b0457f72e2e22a0c58bcaa087 (diff) | |
| download | xen-85c024b331ec621ac4761812392bb08614a2e163.tar.gz xen-85c024b331ec621ac4761812392bb08614a2e163.tar.bz2 xen-85c024b331ec621ac4761812392bb08614a2e163.zip | |
Fix makefiles for hvmloader and vmxassist for FC5 on x86_64
systems.
In FC5, gcc has issues with the command lines used to build
hvmloader and vmxassist. Basically, the compiler doesn't
like the combination of -m64 and -m32. As these are 32 bit
apps, and intended to be, take a modified approach and simply
define XEN_TARGET_ARCH for 32 bits. This cleans up the
command line and builds the images correctly.
From: Ben Thomas <ben@virtualiron.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | tools/firmware/hvmloader/Makefile | 4 | ||||
| -rw-r--r-- | tools/firmware/vmxassist/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index ff95836e90..5a821f7dcb 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -21,6 +21,7 @@ # External CFLAGS can do more harm than good. CFLAGS := +XEN_TARGET_ARCH = x86_32 XEN_ROOT = ../../.. include $(XEN_ROOT)/Config.mk @@ -38,8 +39,7 @@ CFLAGS += $(call test-gcc-flag,$(CC),-fno-stack-protector) CFLAGS += $(call test-gcc-flag,$(CC),-fno-stack-protector-all) OBJCOPY = objcopy -CFLAGS += $(DEFINES) -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float -CFLAGS += -m32 -march=i686 +CFLAGS += $(DEFINES) -I. $(XENINC) -fno-builtin -O2 -msoft-float LDFLAGS = -m32 -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR) all: hvmloader diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile index aabd32cc1a..85c9fff581 100644 --- a/tools/firmware/vmxassist/Makefile +++ b/tools/firmware/vmxassist/Makefile @@ -21,6 +21,7 @@ # External CFLAGS can do more harm than good. CFLAGS := +XEN_TARGET_ARCH = x86_32 XEN_ROOT = ../../.. include $(XEN_ROOT)/Config.mk @@ -37,8 +38,7 @@ CFLAGS += $(call test-gcc-flag,$(CC),-fno-stack-protector-all) CPP = cpp -P OBJCOPY = objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0 -CFLAGS += $(DEFINES) -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float -CFLAGS += -m32 -march=i686 +CFLAGS += $(DEFINES) -I. $(XENINC) -fno-builtin -O2 -msoft-float LDFLAGS = -m elf_i386 OBJECTS = head.o trap.o vm86.o setup.o util.o |