Merge pull request #410 from Quuxplusone/LIBZMQ-414

[LIBZMQ-414] Fix an error in the inline assembly for Thumb2.

Merge pull request #410 from Quuxplusone/LIBZMQ-414
[LIBZMQ-414] Fix an error in the inline assembly for Thumb2.
d588dbf2 · Ian Barber · 033e311d · 28c9255d · d588dbf2
Commit d588dbf2 authored Aug 23, 2012 by Ian Barber
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

atomic_ptr.hpp src/atomic_ptr.hpp +1 -0

No files found.
--- a/src/atomic_ptr.hpp
+++ b/src/atomic_ptr.hpp
@@ -141,6 +141,7 @@ namespace zmq
                "1:     ldrex   %1, [%3]\n\t"
                "       mov     %0, #0\n\t"
                "       teq     %1, %4\n\t"
+                "       it      eq\n\t"
                "       strexeq %0, %5, [%3]\n\t"
                "       teq     %0, #0\n\t"
                "       bne     1b\n\t"