diff options
| author | Martin Storsjo <martin@martin.st> | 2017-10-02 18:14:06 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2017-10-02 18:14:06 +0000 |
| commit | 6fc406ff9b4a437972ad4711c014c809d02e5972 (patch) | |
| tree | 841da7ce74be5cd57043e7dfd8f3c11207ab2084 /libunwind | |
| parent | d7ef9d61324d8c26e5060cbc3d638bc6dd011d0e (diff) | |
Fix building on macOS after SVN r314492
That commit incorrectly expanded the assumption that defined(__APPLE__)
implies SjLj exception handling, which only is true within ARM
code sections.
Diffstat (limited to 'libunwind')
| -rw-r--r-- | libunwind/src/UnwindRegistersRestore.S | 6 | ||||
| -rw-r--r-- | libunwind/src/UnwindRegistersSave.S | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libunwind/src/UnwindRegistersRestore.S b/libunwind/src/UnwindRegistersRestore.S index a90d5f582f2..50b8cfb06fd 100644 --- a/libunwind/src/UnwindRegistersRestore.S +++ b/libunwind/src/UnwindRegistersRestore.S @@ -11,7 +11,7 @@ .text -#if !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) +#if !defined(__USING_SJLJ_EXCEPTIONS__) #if defined(__i386__) DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind13Registers_x866jumptoEv) @@ -310,7 +310,7 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind15Registers_arm646jumptoEv) ldp x0, x1, [x0, #0x000] // restore x0,x1 ret x30 // jump to pc -#elif defined(__arm__) +#elif defined(__arm__) && !defined(__APPLE__) #if !defined(__ARM_ARCH_ISA_ARM) .thumb @@ -493,7 +493,7 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind14Registers_or1k6jumptoEv) #endif -#endif /* !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) */ +#endif /* !defined(__USING_SJLJ_EXCEPTIONS__) */ NO_EXEC_STACK_DIRECTIVE diff --git a/libunwind/src/UnwindRegistersSave.S b/libunwind/src/UnwindRegistersSave.S index 7f5a9acf5a8..716073b48e5 100644 --- a/libunwind/src/UnwindRegistersSave.S +++ b/libunwind/src/UnwindRegistersSave.S @@ -11,7 +11,7 @@ .text -#if !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) +#if !defined(__USING_SJLJ_EXCEPTIONS__) #if defined(__i386__) @@ -291,7 +291,7 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext) mov x0, #0 // return UNW_ESUCCESS ret -#elif defined(__arm__) +#elif defined(__arm__) && !defined(__APPLE__) #if !defined(__ARM_ARCH_ISA_ARM) .thumb @@ -473,7 +473,7 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext) l.sw 124(r3), r31 #endif -#endif /* !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) */ +#endif /* !defined(__USING_SJLJ_EXCEPTIONS__) */ NO_EXEC_STACK_DIRECTIVE |