[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=98e89c6

The following commit has been merged in the master branch:
commit 98e89c6f5bad80bc2dc089331b26c0957afaf6af
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 20 21:40:08 2013 +0100

    further fix for MIPS
    
    also in the orderedMemoryFence implementation
---
 debian/changelog                         |  3 +++
 debian/patches/mips_more_pre-mips32.diff | 20 ++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 74d0778..55f5093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Further fix for MIPS, also in the orderedMemoryFence implementation;
+    patch mips_more_pre-mips32.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Dec 2013 21:31:31 +0100
 
diff --git a/debian/patches/mips_more_pre-mips32.diff b/debian/patches/mips_more_pre-mips32.diff
new file mode 100644
index 0000000..9d4838e
--- /dev/null
+++ b/debian/patches/mips_more_pre-mips32.diff
@@ -0,0 +1,20 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Support atomic on pre-MIPS32 archs, also in orderedMemoryFence
+ Set pre-MIPS32 opcodes also in orderedMemoryFence.
+Last-Update: 2013-12-20
+Forwarded: no
+
+--- a/src/corelib/arch/qatomic_mips.h
++++ b/src/corelib/arch/qatomic_mips.h
+@@ -137,7 +137,10 @@ void QBasicAtomicOps<size>::releaseMemor
+ template <int size> template <typename T> inline
+ void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
+ {
+-    asm volatile ("sync 0" ::: "memory");
++    asm volatile (".set push
"
++                  ".set mips32
"
++                  "sync 0
"
++                  ".set pop
" ::: "memory");
+ }
+ 
+ template<> template<typename T> inline
diff --git a/debian/patches/series b/debian/patches/series
index d9493d4..4e74b9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,6 @@ hurd_opengl_incldir.diff
 fix_power_atomic_code.patch
 support_mips_atomic_on_pre-mips32_archs.patch
 uname_include.diff
+mips_more_pre-mips32.diff
 
 # Debian specific.

-- 
qtbase packaging