1.1 --- a/tools/ioemu/exec-all.h	Wed Jul 26 15:20:30 2006 +0100
     1.2 +++ b/tools/ioemu/exec-all.h	Wed Jul 26 21:13:24 2006 +0100
     1.3 @@ -391,15 +391,6 @@ static inline int testandset (int *p)
     1.4  }
     1.5  #endif
     1.6  
     1.7 -#ifdef __ia64__
     1.8 -#include "ia64_intrinsic.h"
     1.9 -static inline int testandset (int *p)
    1.10 -{
    1.11 -    uint32_t o = 0, n = 1;
    1.12 -    return (int)cmpxchg_acq(p, o, n);
    1.13 -}
    1.14 -#endif
    1.15 -
    1.16  #ifdef __s390__
    1.17  static inline int testandset (int *p)
    1.18  {

     2.1 --- a/tools/ioemu/patches/ioemu-ia64	Wed Jul 26 15:20:30 2006 +0100
     2.2 +++ b/tools/ioemu/patches/ioemu-ia64	Wed Jul 26 21:13:24 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  Index: ioemu/hw/iommu.c
     2.5  ===================================================================
     2.6 ---- ioemu.orig/hw/iommu.c	2006-07-14 13:43:45.000000000 +0100
     2.7 -+++ ioemu/hw/iommu.c	2006-07-26 13:34:50.039997837 +0100
     2.8 +--- ioemu.orig/hw/iommu.c	2006-07-26 15:17:35.639762285 +0100
     2.9 ++++ ioemu/hw/iommu.c	2006-07-26 15:17:39.078387722 +0100
    2.10  @@ -82,7 +82,11 @@
    2.11   #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
    2.12   #define IOPTE_WAZ           0x00000001 /* Write as zeros */
    2.13 @@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
    2.14   
    2.15  Index: ioemu/cpu-all.h
    2.16  ===================================================================
    2.17 ---- ioemu.orig/cpu-all.h	2006-07-26 13:33:45.946834283 +0100
    2.18 -+++ ioemu/cpu-all.h	2006-07-26 13:34:50.038997944 +0100
    2.19 +--- ioemu.orig/cpu-all.h	2006-07-26 15:17:38.728425843 +0100
    2.20 ++++ ioemu/cpu-all.h	2006-07-26 15:17:39.079387613 +0100
    2.21  @@ -835,6 +835,31 @@
    2.22                   :"=m" (*(volatile long *)addr)
    2.23                   :"dIr" (nr));
    2.24 @@ -52,8 +52,8 @@ Index: ioemu/cpu-all.h
    2.25   /* memory API */
    2.26  Index: ioemu/vl.c
    2.27  ===================================================================
    2.28 ---- ioemu.orig/vl.c	2006-07-26 13:33:45.996828953 +0100
    2.29 -+++ ioemu/vl.c	2006-07-26 13:34:50.044997304 +0100
    2.30 +--- ioemu.orig/vl.c	2006-07-26 15:17:39.011395020 +0100
    2.31 ++++ ioemu/vl.c	2006-07-26 21:11:35.957492161 +0100
    2.32  @@ -5577,6 +5577,7 @@
    2.33           exit(-1);
    2.34       }
    2.35 @@ -99,8 +99,8 @@ Index: ioemu/vl.c
    2.36   #ifdef CONFIG_SOFTMMU
    2.37  Index: ioemu/target-i386-dm/exec-dm.c
    2.38  ===================================================================
    2.39 ---- ioemu.orig/target-i386-dm/exec-dm.c	2006-07-26 13:33:45.882841107 +0100
    2.40 -+++ ioemu/target-i386-dm/exec-dm.c	2006-07-26 13:34:50.040997731 +0100
    2.41 +--- ioemu.orig/target-i386-dm/exec-dm.c	2006-07-26 15:17:38.283474311 +0100
    2.42 ++++ ioemu/target-i386-dm/exec-dm.c	2006-07-26 15:17:39.081387395 +0100
    2.43  @@ -340,6 +340,23 @@
    2.44       return io_mem_read[io_index >> IO_MEM_SHIFT];
    2.45   }
    2.46 @@ -137,25 +137,9 @@ Index: ioemu/target-i386-dm/exec-dm.c
    2.47           len -= l;
    2.48  Index: ioemu/exec-all.h
    2.49  ===================================================================
    2.50 ---- ioemu.orig/exec-all.h	2006-07-26 13:33:45.861843346 +0100
    2.51 -+++ ioemu/exec-all.h	2006-07-26 13:38:30.096491388 +0100
    2.52 -@@ -391,6 +391,15 @@
    2.53 - }
    2.54 - #endif
    2.55 - 
    2.56 -+#ifdef __ia64__
    2.57 -+#include "ia64_intrinsic.h"
    2.58 -+static inline int testandset (int *p)
    2.59 -+{
    2.60 -+    uint32_t o = 0, n = 1;
    2.61 -+    return (int)cmpxchg_acq(p, o, n);
    2.62 -+}
    2.63 -+#endif
    2.64 -+
    2.65 - #ifdef __s390__
    2.66 - static inline int testandset (int *p)
    2.67 - {
    2.68 -@@ -462,12 +471,13 @@
    2.69 +--- ioemu.orig/exec-all.h	2006-07-26 15:17:38.200483351 +0100
    2.70 ++++ ioemu/exec-all.h	2006-07-26 21:11:41.262898983 +0100
    2.71 +@@ -462,12 +462,13 @@
    2.72   }
    2.73   #endif
    2.74   
    2.75 @@ -174,8 +158,8 @@ Index: ioemu/exec-all.h
    2.76   
    2.77  Index: ioemu/target-i386-dm/cpu.h
    2.78  ===================================================================
    2.79 ---- ioemu.orig/target-i386-dm/cpu.h	2006-07-26 13:33:45.882841107 +0100
    2.80 -+++ ioemu/target-i386-dm/cpu.h	2006-07-26 13:34:50.040997731 +0100
    2.81 +--- ioemu.orig/target-i386-dm/cpu.h	2006-07-26 15:17:38.282474420 +0100
    2.82 ++++ ioemu/target-i386-dm/cpu.h	2006-07-26 15:17:39.082387287 +0100
    2.83  @@ -80,7 +80,11 @@
    2.84   /* helper2.c */
    2.85   int main_loop(void);
    2.86 @@ -191,7 +175,7 @@ Index: ioemu/target-i386-dm/cpu.h
    2.87  Index: ioemu/ia64_intrinsic.h
    2.88  ===================================================================
    2.89  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    2.90 -+++ ioemu/ia64_intrinsic.h	2006-07-26 13:34:50.038997944 +0100
    2.91 ++++ ioemu/ia64_intrinsic.h	2006-07-26 15:17:39.083387178 +0100
    2.92  @@ -0,0 +1,276 @@
    2.93  +#ifndef IA64_INTRINSIC_H
    2.94  +#define IA64_INTRINSIC_H