Author: mstorsjo Date: Mon Oct 2 11:14:06 2017 New Revision: 314695 URL: http://llvm.org/viewvc/llvm-project?rev=314695&view=rev Log: 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. Modified: libunwind/trunk/src/UnwindRegistersRestore.S libunwind/trunk/src/UnwindRegistersSave.S Modified: libunwind/trunk/src/UnwindRegistersRestore.S URL: http://llvm.org/viewvc/llvm-project/libunwind/trunk/src/UnwindRegistersRestore.S?rev=314695&r1=314694&r2=314695&view=diff ============================================================================== --- libunwind/trunk/src/UnwindRegistersRestore.S (original) +++ libunwind/trunk/src/UnwindRegistersRestore.S Mon Oct 2 11:14:06 2017 @@ -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(_ZN9li 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(_ZN9li #endif -#endif /* !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) */ +#endif /* !defined(__USING_SJLJ_EXCEPTIONS__) */ NO_EXEC_STACK_DIRECTIVE Modified: libunwind/trunk/src/UnwindRegistersSave.S URL: http://llvm.org/viewvc/llvm-project/libunwind/trunk/src/UnwindRegistersSave.S?rev=314695&r1=314694&r2=314695&view=diff ============================================================================== --- libunwind/trunk/src/UnwindRegistersSave.S (original) +++ libunwind/trunk/src/UnwindRegistersSave.S Mon Oct 2 11:14:06 2017 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits