Skip to contentSkip to conversation

- Makefiles for tools/loader/{hvmloader|vmxassist}

PATCH In review Ben Thomas 2 participants 3 messages Mar 31, 2006 – Apr 1, 2006

lore
Share & tools
lore

Ben Thomas

author
#0 lore raw

PATCH 1/1 - Makefiles for tools/loader/{hvmloader|vmxassist}

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.

We could also wait for a gcc fix, but...

Signature · 5 lines
------------------------------------------------------------------------
Ben Thomas                                         Virtual Iron Software
[email protected]                            Tower 1, Floor 2
978-849-1214                                       900 Chelmsford Street
                                                   Lowell, MA 01851
tools/firmware/hvmloader/Makefile +1 -1
diff -r 6730b42c7289 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
 
@@ -39,7 +40,6 @@ CFLAGS  += $(call test-gcc-flag,$(CC),-f
 
 OBJCOPY  = objcopy
 CFLAGS  += $(DEFINES) -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
-CFLAGS  += -m32 -march=i686
 LDFLAGS  = -m32 -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR)
 
 all: hvmloader
tools/firmware/vmxassist/Makefile +1 -1
diff -r 6730b42c7289 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
 
@@ -38,7 +39,6 @@ CPP      = cpp -P
 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
 LDFLAGS  = -m elf_i386
 
 OBJECTS = head.o trap.o vm86.o setup.o util.o

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 8 lines · Ben Thomas

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.

We could also wait for a gcc fix, but...

No, this patch is sane. Putting both switches on the command line makes no sense. I wonder whether to simply put 'CFLAGS :=' *after* the include of Rules.mk though.

-- Keir

author
#2 lore raw

-----Original Message-----
From: Keir Fraser [mailto:[email protected]]
Sent: Sat 4/1/2006 4:03 AM
To: Ben Thomas
Cc: [email protected]
Subject: Re: [Xen-devel] [PATCH] - Makefiles for tools/loader/{hvmloader|vmxassist}

Quoted 8 lines · Ben Thomas

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.

We could also wait for a gcc fix, but...

No, this patch is sane. Putting both switches on the command line makes no sense. I wonder whether to simply put 'CFLAGS :=' *after* the include of Rules.mk though.

-- Keir

Possibly. I have a feeling that CFLAGS wasn't the only thing. Perhaps LDFLAGS got modified as well ? I cannot recall. The image really needs to be 32 bits, as near as I can see.

I tried a few options, but eventually tired of trying to outguess make and gcc. In the end, this is a 32 bit app and this patch worked. However, you're more familiar with the environment than I am. As long as it builds/works, I'm happy. I actually waited a few days to see if someone else would fix it before I did.

Thanks,
-b

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel