summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@nokia.com>2011-08-10 07:38:37 (GMT)
committerEike Ziller <eike.ziller@nokia.com>2011-08-17 08:04:50 (GMT)
commit6be1b235f7db38146f7080a4bfcfe3051ae54699 (patch)
tree02737db040d33bf99e9462429d7339d710d87770
parentebe1233c4fa3eb728f7e6b8355cb1b4c0dd65213 (diff)
downloadQt-6be1b235f7db38146f7080a4bfcfe3051ae54699.zip
Qt-6be1b235f7db38146f7080a4bfcfe3051ae54699.tar.gz
Qt-6be1b235f7db38146f7080a4bfcfe3051ae54699.tar.bz2
Fix compilation with thumb2.
Task-number: QTBUG-16402 Rubber-stamped-by: Thiago Macieira
-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 96b561e..dd465db 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"