- merged PLD changes

[packages/qemu.git] / x32.patch

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..54e6a61
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,22 @@
+--- 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
+@@ -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