diff options
| -rw-r--r-- | libcxxabi/src/Unwind/UnwindRegistersRestore.S | 2 | ||||
| -rw-r--r-- | libcxxabi/src/Unwind/UnwindRegistersSave.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxxabi/src/Unwind/UnwindRegistersRestore.S b/libcxxabi/src/Unwind/UnwindRegistersRestore.S index 362a5b04f54..5fdb78970d7 100644 --- a/libcxxabi/src/Unwind/UnwindRegistersRestore.S +++ b/libcxxabi/src/Unwind/UnwindRegistersRestore.S @@ -326,7 +326,7 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind13Registers_arm20restoreCoreAndJu ldm lr, {r0-r12} ldr sp, [lr, #52] ldr lr, [lr, #60] @ restore pc into lr -#if _ARM_ARCH > 4 +#if __ARM_ARCH > 4 bx lr #else mov pc, lr diff --git a/libcxxabi/src/Unwind/UnwindRegistersSave.S b/libcxxabi/src/Unwind/UnwindRegistersSave.S index d23c81644c9..1e988e23f56 100644 --- a/libcxxabi/src/Unwind/UnwindRegistersSave.S +++ b/libcxxabi/src/Unwind/UnwindRegistersSave.S @@ -304,7 +304,7 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext) str lr, [r0, #56] str lr, [r0, #60] @ store return address as pc mov r0, #0 @ return UNW_ESUCCESS -#if _ARM_ARCH > 4 +#if __ARM_ARCH > 4 bx lr #else mov pc, lr |
