[packages/qemu] - disable C11 atomic ops (use old impl) on x32 to avoid GCC ICE - rel 2
baggins
baggins at pld-linux.org
Sun Jul 17 18:40:22 CEST 2016
commit b04eac963969558db57b4e36a4654493d618a81a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jul 17 18:39:47 2016 +0200
- disable C11 atomic ops (use old impl) on x32 to avoid GCC ICE
- rel 2
qemu.spec | 2 +-
x32.patch | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/qemu.spec b/qemu.spec
index 7bbbcae..fd85cb1 100644
--- 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 2efe351..beee3de 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qemu.git/commitdiff/b04eac963969558db57b4e36a4654493d618a81a
More information about the pld-cvs-commit
mailing list