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