[SCM] qtbase packaging branch, experimental, updated. debian/5.3.1+dfsg-5-10-g81421cc

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit d918452c8c2bd165f0d5860e389e9df929ee08eb
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Sep 16 09:50:27 2014 -0300

    Remove support_mips_atomic_on_pre-mips32_archs.patch.
    
    Applied upstream.
---
 debian/changelog                                   |  2 +
 debian/patches/series                              |  1 -
 .../support_mips_atomic_on_pre-mips32_archs.patch  | 49 ----------------------
 3 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ebbeb7b..2d5604f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtbase-opensource-src (5.3.2+dfsg-1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
+  * Remove support_mips_atomic_on_pre-mips32_archs.patch, applied upstream with
+    a fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 07 Sep 2014 14:58:47 +0400
 
diff --git a/debian/patches/series b/debian/patches/series
index cff6675..9eb9ff3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 remove_icon_from_example.patch
 hurd_opengl_incldir.diff
-support_mips_atomic_on_pre-mips32_archs.patch
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
 Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch
diff --git a/debian/patches/support_mips_atomic_on_pre-mips32_archs.patch b/debian/patches/support_mips_atomic_on_pre-mips32_archs.patch
deleted file mode 100644
index 0a890c4..0000000
--- a/debian/patches/support_mips_atomic_on_pre-mips32_archs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From cb4da6380c6af2bce871ae466f1ba445339adc3a Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien at aurel32.net>
-Date: Sun, 10 Nov 2013 23:20:46 +0100
-Subject: [PATCH] Support MIPS atomic on pre-MIPS32 architectures
-
-The atomic functions on MIPS are based on the sync opcode with an
-immediate argument, which is something introduced in the MIPS32
-instruction set. This prevent to use Qt on pre-MIPS32 CPU, like the
-Loongson 2 CPU.
-
-However some of the pre-MIPS32 CPUs interprets the sync opcode with and
-immediate argument as a sync opcode without argument (which is a stronger
-ordering than with the argument), and for the others the kernel emulates
-it.
-
-It is therefore fine to use the current MIPS atomic functions on
-pre-MIPS32 CPU. This patch allows that by temporarily changing the
-instruction set to MIPS32 around the sync instruction, so that binutils
-doesn't choke on it.
-
-Change-Id: I9cc984bd55b5f172736ce9e638a6f4e271b79fe7
----
- src/corelib/arch/qatomic_mips.h |   10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/src/corelib/arch/qatomic_mips.h
-+++ b/src/corelib/arch/qatomic_mips.h
-@@ -110,13 +110,19 @@ template <typename T> struct QAtomicOps
- template <int size> template <typename T> inline
- void QBasicAtomicOps<size>::acquireMemoryFence(const T &) Q_DECL_NOTHROW
- {
--    asm volatile ("sync 0x11" ::: "memory");
-+    asm volatile (".set push
"
-+                  ".set mips32
"
-+                  "sync 0x11
"
-+                  ".set pop
" ::: "memory");
- }
- 
- template <int size> template <typename T> inline
- void QBasicAtomicOps<size>::releaseMemoryFence(const T &) Q_DECL_NOTHROW
- {
--    asm volatile ("sync 0x12" ::: "memory");
-+    asm volatile (".set push
"
-+                  ".set mips32
"
-+                  "sync 0x11
"
-+                  ".set pop
" ::: "memory");
- }
- 
- template <int size> template <typename T> inline

-- 
qtbase packaging