- disable C11 atomic ops (use old impl) on x32 to avoid GCC ICE

- rel 2

diff --git a/qemu.spec b/qemu.spec
index 7bbbcae6a1a5fa01075ed50b0111622d5e3fccdb..fd85cb1c7de440b8f2aa81dc5dba3d11be479584 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -37,7 +37,7 @@ Summary:      QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
 Version:       2.6.0
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2

diff --git a/x32.patch b/x32.patch
index 2efe351a490260cedccfe7e68210df724a6d0270..beee3deda90b63a5e603ce6b214a453448a5cda7 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -28,3 +28,14 @@
          "$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