- updated to 2.8.0, partial PLD merge

[packages/qemu.git] / x32.patch

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..beee3de
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,41 @@
+--- 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 @@
+ 
+ if test "$seccomp" != "no" ; then
+     case "$cpu" in
+-    i386|x86_64)
++    i386|x86_64|x32)
+         libseccomp_minver="2.1.0"
+         ;;
+     arm|aarch64)
+@@ -2932,7 +2932,7 @@
+ ##########################################
+ # TPM passthrough is only on x86 Linux
+ 
+-if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
++if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64 -o "$cpu" = x32; then
+   tpm_passthrough=$tpm
+ else
+   tpm_passthrough=no
+@@ -4161,7 +4161,7 @@
+ 
+ # Mac OS X ships with a broken assembler
+ roms=
+-if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
++if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" -o "$cpu" = "x32" \) -a \
+         "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
+         "$softmmu" = yes ; then
+   roms="optionrom"
+
+--- 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