1 --- qemu-2.2.0/configure~ 2015-03-26 19:52:14.000000000 +0100
2 +++ qemu-2.2.0/configure 2015-03-26 19:56:34.255072716 +0100
5 if test "$seccomp" != "no" ; then
9 libseccomp_minver="2.1.0"
13 ##########################################
14 # TPM passthrough is only on x86 Linux
16 -if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
17 +if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64 -o "$cpu" = x32; then
23 # Mac OS X ships with a broken assembler
25 -if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
26 +if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" -o "$cpu" = "x32" \) -a \
27 "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
28 "$softmmu" = yes ; then
31 --- qemu-2.6.0/include/qemu/atomic.h~ 2016-07-17 18:37:57.000000000 +0200
32 +++ qemu-2.6.0/include/qemu/atomic.h 2016-07-17 18:38:33.485893530 +0200
34 /* Compiler barrier */
35 #define barrier() ({ asm volatile("" ::: "memory"); (void)0; })
37 -#ifdef __ATOMIC_RELAXED
38 +#if defined(__ATOMIC_RELAXED) && !defined(__ILP32__)
39 /* For C11 atomic ops */
41 /* Manual memory barriers