[Xen-devel] [PATCH] fix x86_64 build with specified CFLAGS

[Rik van Riel <riel@xxxxxxxxxx>]

When building Xen, RPM passes in a bunch of CFLAGS.  Make sure to
remove the -m64 from the CFLAGS before compiling vmxloader and
hvmloader.

Note that this is not a question of building from RPM, even when
passing in empty CFLAGS this problem occurs.


Signed-off-by: Rik van Riel <riel@xxxxxxxxxx>

--- xen-3.0.1/tools/firmware/vmxassist/Makefile.m64     2006-02-28 
10:14:19.000000000 -0500
+++ xen-3.0.1/tools/firmware/vmxassist/Makefile 2006-03-02 10:49:53.000000000 
-0500
@@ -27,6 +27,9 @@
 DEFINES=-DDEBUG -DTEXTADDR=$(TEXTADDR)
 XENINC=-I$(XEN_ROOT)/tools/libxc
 
+# vmxloader is a 32 bit program
+CFLAGS=$(echo "$CFLAGS" | sed -e 's/ -m64//g')
+
 # Disable PIE/SSP if GCC supports them. They can break us.
 CFLAGS  += $(call test-gcc-flag,$(CC),-nopie)
 CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector)
--- xen-3.0.1/tools/firmware/hvmloader/Makefile.m64     2006-03-02 
10:52:21.000000000 -0500
+++ xen-3.0.1/tools/firmware/hvmloader/Makefile 2006-03-02 10:52:54.000000000 
-0500
@@ -29,6 +29,9 @@
 
 OBJECTS         = hvmloader.o acpi_madt.o 
 
+# hvmloader is a 32 bit program
+CFLAGS=$(echo "$CFLAGS" | sed -e 's/ -m64//g')
+
 # Disable PIE/SSP if GCC supports them. They can break us.
 CFLAGS  += $(call test-gcc-flag,$(CC),-nopie)
 CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector)

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel