From a3bd9d4c0f3d9e80dbe35bd88649b245dca5f410 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 10 Aug 2011 09:38:37 +0200 Subject: 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 Reviewed-by: Eckhart Koppen Reviewed-by: Lars Knoll --- src/corelib/arch/qatomic_armv6.h | 2 ++ 1 file changed, 2 insertions(+) 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::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" -- cgit v1.2.3