From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Thomas Subject: [PATCH] - Makefiles for tools/loader/{hvmloader|vmxassist} Date: Fri, 31 Mar 2006 16:24:33 -0500 Message-ID: <442D9E11.1040406@virtualiron.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------020402070005020402080801" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------020402070005020402080801 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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... Signed-off-by: Ben Thomas (ben@virtualiron.com) -- ------------------------------------------------------------------------ Ben Thomas Virtual Iron Software bthomas@virtualiron.com Tower 1, Floor 2 978-849-1214 900 Chelmsford Street Lowell, MA 01851 --------------020402070005020402080801 Content-Type: text/x-patch; name="m.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="m.patch" diff -r 6730b42c7289 tools/firmware/hvmloader/Makefile --- a/tools/firmware/hvmloader/Makefile Fri Mar 31 14:28:59 2006 -0500 +++ b/tools/firmware/hvmloader/Makefile Fri Mar 31 15:58:44 2006 -0500 @@ -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 diff -r 6730b42c7289 tools/firmware/vmxassist/Makefile --- a/tools/firmware/vmxassist/Makefile Fri Mar 31 14:28:59 2006 -0500 +++ b/tools/firmware/vmxassist/Makefile Fri Mar 31 15:58:44 2006 -0500 @@ -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 --------------020402070005020402080801 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------020402070005020402080801--