diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
commit | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (patch) | |
tree | 1022f5553ad5a0aca9b5f3b49ca38a01c2329d20 /src/corelib/arch/qatomic_armv6.h | |
parent | c79918733a194ebbe5a2fe1617c884659f3e4b9f (diff) | |
parent | 21f1738a94fc8544ece04b3b1ee03a11986fe59b (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qjpeghandler.cpp
Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
Diffstat (limited to 'src/corelib/arch/qatomic_armv6.h')
-rw-r--r-- | src/corelib/arch/qatomic_armv6.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h index 31a06541ed..3fd07e0813 100644 --- a/src/corelib/arch/qatomic_armv6.h +++ b/src/corelib/arch/qatomic_armv6.h @@ -171,8 +171,8 @@ bool QBasicAtomicOps<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newVa template<> template <typename T> inline bool QBasicAtomicOps<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW { - register T tempValue; - register int result; + T tempValue; + int result; asm volatile("0:\n" "ldrex %[tempValue], [%[_q_value]]\n" "eors %[result], %[tempValue], %[expectedValue]\n" @@ -352,8 +352,8 @@ bool QBasicAtomicOps<1>::testAndSetRelaxed(T &_q_value, T expectedValue, T newVa template<> template <typename T> inline bool QBasicAtomicOps<1>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW { - register T tempValue; - register T result; + T tempValue; + T result; asm volatile("0:\n" "ldrexb %[tempValue], [%[_q_value]]\n" "eors %[result], %[tempValue], %[expectedValue]\n" @@ -474,8 +474,8 @@ bool QBasicAtomicOps<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newVa template<> template <typename T> inline bool QBasicAtomicOps<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW { - register T tempValue; - register T result; + T tempValue; + T result; asm volatile("0:\n" "ldrexh %[tempValue], [%[_q_value]]\n" "eors %[result], %[tempValue], %[expectedValue]\n" @@ -608,8 +608,8 @@ bool QBasicAtomicOps<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newVa template<> template <typename T> inline bool QBasicAtomicOps<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW { - register T tempValue; - register T result; + T tempValue; + T result; asm volatile("0:\n" "ldrexd %[tempValue], %H[tempValue], [%[_q_value]]\n" "eor %[result], %[tempValue], %[expectedValue]\n" |