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 # Mac OS X ships with a broken assembler
7 -if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
8 +if { test "$cpu" = "i386" || test "$cpu" = "x86_64" || test "$cpu" = "x32"; } && \
9 test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \
10 test "$softmmu" = yes ; then
11 # Different host OS linkers have different ideas about the name of the ELF
12 --- qemu-2.6.0/include/qemu/atomic.h~ 2016-07-17 18:37:57.000000000 +0200
13 +++ qemu-2.6.0/include/qemu/atomic.h 2016-07-17 18:38:33.485893530 +0200
15 /* Compiler barrier */
16 #define barrier() ({ asm volatile("" ::: "memory"); (void)0; })
18 -#ifdef __ATOMIC_RELAXED
19 +#if defined(__ATOMIC_RELAXED) && !defined(__ILP32__)
20 /* For C11 atomic ops */
22 /* Manual memory barriers