summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@nokia.com>2011-08-10 09:38:37 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-18 17:59:18 +0200
commita3bd9d4c0f3d9e80dbe35bd88649b245dca5f410 (patch)
tree8fe44e95a5134065e6c49b01bb0b95b75120c192 /src/corelib/arch
parent83d8cd6067da522ce107a5b68a4cf2f81f84f881 (diff)
Fix compilation with thumb2.
Task-number: QTBUG-16402 Rubber-stamped-by: Thiago Macieira (cherry picked from commit 6be1b235f7db38146f7080a4bfcfe3051ae54699) Change-Id: I6f60f1d3079395e765a183961db5c8543cf58cdc Reviewed-on: http://codereview.qt.nokia.com/3078 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eckhart Koppen <eckhart.koppen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/arch')
-rw-r--r--src/corelib/arch/qatomic_armv6.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h
index 96b561e742..dd465db18b 100644
--- a/src/corelib/arch/qatomic_armv6.h
+++ b/src/corelib/arch/qatomic_armv6.h
@@ -152,6 +152,7 @@ inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
asm volatile("0:\n"
"ldrex %[result], [%[_q_value]]\n"
"eors %[result], %[result], %[expectedValue]\n"
+ "itt eq\n"
"strexeq %[result], %[newValue], [%[_q_value]]\n"
"teqeq %[result], #1\n"
"beq 0b\n"
@@ -210,6 +211,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValu
asm volatile("0:\n"
"ldrex %[result], [%[_q_value]]\n"
"eors %[result], %[result], %[expectedValue]\n"
+ "itt eq\n"
"strexeq %[result], %[newValue], [%[_q_value]]\n"
"teqeq %[result], #1\n"
"beq 0b\n"