ia64/xen-unstable

changeset 9560:cfee00c6cd88

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>
author kaf24@firebug.cl.cam.ac.uk
date Sat Apr 01 10:49:42 2006 +0100 (2006-04-01)
parents aa13ac536dec
children 767e14b727fa
files tools/firmware/hvmloader/Makefile tools/firmware/vmxassist/Makefile
line diff
     1.1 --- a/tools/firmware/hvmloader/Makefile	Sat Apr 01 10:40:54 2006 +0100
     1.2 +++ b/tools/firmware/hvmloader/Makefile	Sat Apr 01 10:49:42 2006 +0100
     1.3 @@ -21,6 +21,7 @@
     1.4  # External CFLAGS can do more harm than good.
     1.5  CFLAGS :=
     1.6  
     1.7 +XEN_TARGET_ARCH = x86_32
     1.8  XEN_ROOT = ../../..
     1.9  include $(XEN_ROOT)/Config.mk
    1.10  
    1.11 @@ -38,8 +39,7 @@ CFLAGS  += $(call test-gcc-flag,$(CC),-f
    1.12  CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector-all)
    1.13  
    1.14  OBJCOPY  = objcopy
    1.15 -CFLAGS  += $(DEFINES) -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
    1.16 -CFLAGS  += -m32 -march=i686
    1.17 +CFLAGS  += $(DEFINES) -I. $(XENINC) -fno-builtin -O2 -msoft-float
    1.18  LDFLAGS  = -m32 -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR)
    1.19  
    1.20  all: hvmloader
     2.1 --- a/tools/firmware/vmxassist/Makefile	Sat Apr 01 10:40:54 2006 +0100
     2.2 +++ b/tools/firmware/vmxassist/Makefile	Sat Apr 01 10:49:42 2006 +0100
     2.3 @@ -21,6 +21,7 @@
     2.4  # External CFLAGS can do more harm than good.
     2.5  CFLAGS :=
     2.6  
     2.7 +XEN_TARGET_ARCH = x86_32
     2.8  XEN_ROOT = ../../..
     2.9  include $(XEN_ROOT)/Config.mk
    2.10  
    2.11 @@ -37,8 +38,7 @@ CFLAGS  += $(call test-gcc-flag,$(CC),-f
    2.12  
    2.13  CPP      = cpp -P
    2.14  OBJCOPY  = objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
    2.15 -CFLAGS  += $(DEFINES) -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
    2.16 -CFLAGS  += -m32 -march=i686
    2.17 +CFLAGS  += $(DEFINES) -I. $(XENINC) -fno-builtin -O2 -msoft-float
    2.18  LDFLAGS  = -m elf_i386
    2.19  
    2.20  OBJECTS = head.o trap.o vm86.o setup.o util.o