1.1 --- a/tools/Makefile	Tue Jan 22 14:31:10 2008 +0000
     1.2 +++ b/tools/Makefile	Tue Jan 22 14:34:37 2008 +0000
     1.3 @@ -78,7 +78,7 @@ IOEMU_CONFIGURE_CROSS ?= --cross-prefix=
     1.4  endif
     1.5  ioemu ioemuinstall:
     1.6  	[ -f $(IOEMU_DIR)/config-host.mak ] || \
     1.7 -	  ( cd $(IOEMU_DIR) && sh configure --prefix=/usr \
     1.8 +	  ( cd $(IOEMU_DIR) && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure --prefix=/usr \
     1.9  		$(IOEMU_CONFIGURE_CROSS) )
    1.10  	$(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@)
    1.11  ioemuclean:

     2.1 --- a/tools/ioemu/configure	Tue Jan 22 14:31:10 2008 +0000
     2.2 +++ b/tools/ioemu/configure	Tue Jan 22 14:34:37 2008 +0000
     2.3 @@ -29,43 +29,15 @@ ar="ar"
     2.4  make="make"
     2.5  install="install"
     2.6  strip="strip"
     2.7 -cpu=`uname -m`
     2.8  target_list=""
     2.9 -case "$cpu" in
    2.10 -  i386|i486|i586|i686|i86pc|BePC)
    2.11 +case "$XEN_TARGET_ARCH" in
    2.12 +  x86_32)
    2.13      cpu="i386"
    2.14    ;;
    2.15 -  armv*b)
    2.16 -    cpu="armv4b"
    2.17 -  ;;
    2.18 -  armv*l)
    2.19 -    cpu="armv4l"
    2.20 -  ;;
    2.21 -  alpha)
    2.22 -    cpu="alpha"
    2.23 -  ;;
    2.24 -  "Power Macintosh"|ppc|ppc64)
    2.25 +  powerpc)
    2.26      cpu="powerpc"
    2.27    ;;
    2.28 -  mips)
    2.29 -    cpu="mips"
    2.30 -  ;;
    2.31 -  s390)
    2.32 -    cpu="s390"
    2.33 -  ;;
    2.34 -  sparc|sun4[muv])
    2.35 -    cpu="sparc"
    2.36 -  ;;
    2.37 -  sparc64)
    2.38 -    cpu="sparc64"
    2.39 -  ;;
    2.40 -  ia64)
    2.41 -    cpu="ia64"
    2.42 -  ;;
    2.43 -  m68k)
    2.44 -    cpu="m68k"
    2.45 -  ;;
    2.46 -  x86_64|amd64)
    2.47 +  x86_64)
    2.48      cpu="x86_64"
    2.49      libdir="lib64"
    2.50    ;;