ioemu breaks build

The following patch fixes the following build failure:

gcc

(quoted diff) +0 -2

-Wl,-T,/home/xen/builds/200505221736/xen-unstable/tools/ioemu/GenuineIntel.ld 
-o qemu-dm vl.o exec.o monitor.o osdep.o block.o readline.o pci.o 

console.o block-cloop.o ide.o ne2000.o pckbd.o vga.o dma.o fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o sdl.o libqemu.a -lm

(quoted diff) +0 -3

-L../../../dist/install/usr/lib -lxc -lxutil -lz -L/usr/lib 
-Wl,-rpath,/usr/lib -lSDL -lpthread -lm -ldl -lasound -lX11 -lXext 
-lvga  -lutil

/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../../i686-pc-linux-gnu/bin/ld: cannot open linker script file /home/xen/builds/200505221736/xen-unstable/tools/ioemu/GenuineIntel.ld: No such file or directory
collect2: ld returned 1 exit status
make[5]: *** [qemu-dm] Error 1
make[5]: Leaving directory `/home/xen/builds/200505221736/xen-unstable/tools/ioemu/target-i386-dm'
make[4]: *** [all] Error 1

I've confirmed the build for x86_32. I do not have VMX hardware though so that's all I can do.

Regards,

Anthony Liguori

Signed-off-by Anthony Liguori <[email protected]>

------------------------------------------------------------------------

diff -ur xen-unstable-orig/tools/ioemu/target-i386-dm/Makefile xen-unstable/tools/ioemu/target-i386-dm/Makefile

tools/ioemu/target-i386-dm/Makefile +0 -0

@@ -300,7 +300,7 @@

ifdef CONFIG_STATIC
VL_LDFLAGS+=-static
endif

tools/ioemu/target-i386-dm/Makefile +1 -1

-VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(HOST_ARCH).ld
+VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(TARGET_ARCH).ld

ifndef CONFIG_DARWIN
ifndef CONFIG_WIN32
VL_LIBS=-lutil

A better fix may be to set HOST_ARCH to i386 explicitly. Since ioemu doesn't build for x86_32 this seems reasonable.