+++ /dev/null
---- qemu-2.2.0/configure~ 2015-03-26 19:52:14.000000000 +0100
-+++ qemu-2.2.0/configure 2015-03-26 19:56:34.255072716 +0100
-@@ -1904,7 +1904,7 @@
- libseccomp_minver="2.2.0"
- if test "$seccomp" != "no" ; then
- case "$cpu" in
-- i386|x86_64|mips)
-+ i386|x86_64|x32|mips)
- ;;
- arm|aarch64)
- libseccomp_minver="2.2.3"
-@@ -6148,7 +6148,7 @@
-
- # Mac OS X ships with a broken assembler
- roms=
--if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
-+if { test "$cpu" = "i386" || test "$cpu" = "x86_64" || test "$cpu" = "x32"; } && \
- test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \
- test "$softmmu" = yes ; then
- # Different host OS linkers have different ideas about the name of the ELF
---- qemu-2.6.0/include/qemu/atomic.h~ 2016-07-17 18:37:57.000000000 +0200
-+++ qemu-2.6.0/include/qemu/atomic.h 2016-07-17 18:38:33.485893530 +0200
-@@ -20,7 +20,7 @@
- /* Compiler barrier */
- #define barrier() ({ asm volatile("" ::: "memory"); (void)0; })
-
--#ifdef __ATOMIC_RELAXED
-+#if defined(__ATOMIC_RELAXED) && !defined(__ILP32__)
- /* For C11 atomic ops */
-
- /* Manual memory barriers