summaryrefslogtreecommitdiffstats
path: root/libcxxabi/src
diff options
context:
space:
mode:
authorJonathan Roelofs <jonathan@codesourcery.com>2015-02-14 00:21:03 +0000
committerJonathan Roelofs <jonathan@codesourcery.com>2015-02-14 00:21:03 +0000
commitc1d025fb617c909499ff59deafbe2a15ecea5f4e (patch)
tree0d5bf50a67dd4634dfaa7f0739387655f9264ac7 /libcxxabi/src
parent2d5fb68ee0149129c29ac6a0bfe93814de5e317e (diff)
downloadbcm5719-llvm-c1d025fb617c909499ff59deafbe2a15ecea5f4e.tar.gz
bcm5719-llvm-c1d025fb617c909499ff59deafbe2a15ecea5f4e.zip
Make the unwinder build on thumbv6-m with the integrated assembler.
http://reviews.llvm.org/D7630 llvm-svn: 229194
Diffstat (limited to 'libcxxabi/src')
-rw-r--r--libcxxabi/src/Unwind/UnwindRegistersSave.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/libcxxabi/src/Unwind/UnwindRegistersSave.S b/libcxxabi/src/Unwind/UnwindRegistersSave.S
index 3f7400f4185..aa437ca2a17 100644
--- a/libcxxabi/src/Unwind/UnwindRegistersSave.S
+++ b/libcxxabi/src/Unwind/UnwindRegistersSave.S
@@ -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)
@
OpenPOWER on IntegriCloud