[libcxxabi] r229194 - Make the unwinder build on thumbv6-m with the integrated assembler.

[Jonathan Roelofs]

Author: jroelofs
Date: Fri Feb 13 18:21:03 2015
New Revision: 229194

URL: http://llvm.org/viewvc/llvm-project?rev=229194&view=rev
Log:
Make the unwinder build on thumbv6-m with the integrated assembler.

http://reviews.llvm.org/D7630

Modified:
    libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S

Modified: libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S?rev=229194&r1=229193&r2=229194&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S (original)
+++ libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S Fri Feb 13 18:21:03 2015
@@ -316,7 +316,11 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext
   str lr, [r0, #56]
   str lr, [r0, #60]  @ store return address as pc
 #endif
+#if __ARM_ARCH_ISA_THUMB1 == 1
+  movs r0, #0        @ return UNW_ESUCCESS
+#else
   mov r0, #0         @ return UNW_ESUCCESS
+#endif
   JMP(lr)
 
 @