diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 18:59:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 18:59:49 (GMT) |
| commit | ff7f7dd596511de4c629b6c7f97d32a21049bb95 (patch) | |
| tree | 2a28048a370fb8b4d404df73cc9e399541231716 /src/corelib | |
| parent | e2abcf0d8e83a9403c57b1504a663310e888e2dd (diff) | |
| parent | 01f651a03fc24c370cf7dca55ed7dce00f60503a (diff) | |
| download | Qt-ff7f7dd596511de4c629b6c7f97d32a21049bb95.zip Qt-ff7f7dd596511de4c629b6c7f97d32a21049bb95.tar.gz Qt-ff7f7dd596511de4c629b6c7f97d32a21049bb95.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
uikit: Fixes for Open GL ES 1 and for pre-3GS devices
uikit: Fix warning.
Use thumb instructions for uikit
Fix compilation with thumb2.
Update uikit README: svg works, warn about thumb
Fix bidi reordering of RTL text with embedded images
Fixed infinite loop when loading certain SVGs.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/qatomic_armv6.h | 2 |
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" |