diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-31 16:36:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-31 17:29:06 +0200 |
| commit | a5cf862f612bfd3db91ab1a6974d7c02aa823857 (patch) | |
| tree | 7a0103c0743328edf01ea92e8089a9350e9897ef /src/corelib/arch/qatomic_mips.h | |
| parent | c0429719c1a28bb1a0d88862b3a8c84525ee9a48 (diff) | |
| parent | 87d15f2c1b5f890d5477c2979227a872e3ce207b (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into 5.3" into refs/staging/5.3
Diffstat (limited to 'src/corelib/arch/qatomic_mips.h')
| -rw-r--r-- | src/corelib/arch/qatomic_mips.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h index 463612212b..7bfe16a450 100644 --- a/src/corelib/arch/qatomic_mips.h +++ b/src/corelib/arch/qatomic_mips.h @@ -110,13 +110,19 @@ template <typename T> struct QAtomicOps : QBasicAtomicOps<sizeof(T)> 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\n" + ".set mips32\n" + "sync 0x11\n" + ".set pop\n" ::: "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\n" + ".set mips32\n" + "sync 0x11\n" + ".set pop\n" ::: "memory"); } template <int size> template <typename T> inline |