diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-12-04 13:47:12 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-12-04 13:47:12 +0200 |
| commit | 9bc3eecbb28c4efd71c03f36497701879d9dc054 (patch) | |
| tree | d3cdf334fe6eaf8903b17bf4bc2d3513206e7bef /main/spice/fix-non-x86-build.patch | |
| parent | a22b228c20bb2e9ec09270beb68c556396690792 (diff) | |
| download | aports-9bc3eecbb28c4efd71c03f36497701879d9dc054.tar.bz2 aports-9bc3eecbb28c4efd71c03f36497701879d9dc054.tar.xz | |
main/spice: fix memory barriers on non-x86 architectures
Diffstat (limited to 'main/spice/fix-non-x86-build.patch')
| -rw-r--r-- | main/spice/fix-non-x86-build.patch | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/main/spice/fix-non-x86-build.patch b/main/spice/fix-non-x86-build.patch index cca3b1cbeb..04a560b127 100644 --- a/main/spice/fix-non-x86-build.patch +++ b/main/spice/fix-non-x86-build.patch @@ -1,6 +1,8 @@ +See also: https://bugs.freedesktop.org/show_bug.cgi?id=86997 + diff -ru spice-0.12.5.orig/client/utils.h spice-0.12.5/client/utils.h ---- spice-0.12.5.orig/client/utils.h 2014-05-14 14:14:34.000000000 -0300 -+++ spice-0.12.5/client/utils.h 2014-12-03 16:49:54.630411626 -0200 +--- spice-0.12.5.orig/client/utils.h 2014-12-04 13:45:13.843329437 -0200 ++++ spice-0.12.5/client/utils.h 2014-12-04 13:44:58.449995951 -0200 @@ -50,9 +50,13 @@ throw Exception(exption_string, err); \ } @@ -15,3 +17,20 @@ diff -ru spice-0.12.5.orig/client/utils.h spice-0.12.5/client/utils.h template <class T> class AutoRef { +diff -ru spice-0.12.5.orig/spice-common/spice-protocol/spice/barrier.h spice-0.12.5/spice-common/spice-protocol/spice/barrier.h +--- spice-0.12.5.orig/spice-common/spice-protocol/spice/barrier.h 2013-12-10 20:42:54.000000000 -0200 ++++ spice-0.12.5/spice-common/spice-protocol/spice/barrier.h 2014-12-04 13:45:54.593329844 -0200 +@@ -34,12 +34,7 @@ + + #ifdef __GNUC__ + +-#ifdef __i386__ +-#define spice_mb() __asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory") +-#else +-//mfence +-#define spice_mb() __asm__ __volatile__ ("lock; addl $0,0(%%rsp)": : :"memory") +-#endif ++#define spice_mb() __sync_synchronize() + + #else + |