whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Eike Ziller 2011-08-10 09:38:37 +02:00 committed by Qt by Nokia
parent 83d8cd6067
commit a3bd9d4c0f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/arch/qatomic_armv6.h
View File

@ -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"