[libunwind] r314492 - Skip building x86 parts of UnwindRegisters*.S when targeting SjLj

[Martin Storsjo via cfe-commits]

Author: mstorsjo
Date: Thu Sep 28 23:09:09 2017
New Revision: 314492

URL: http://llvm.org/viewvc/llvm-project?rev=314492&view=rev
Log:
Skip building x86 parts of UnwindRegisters*.S when targeting SjLj

This extends SVN r314197 from the arm parts to the whole file.

Differential Revision: https://reviews.llvm.org/D38381

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=314492&r1=314491&r2=314492&view=diff
==============================================================================
--- libunwind/trunk/src/UnwindRegistersRestore.S (original)
+++ libunwind/trunk/src/UnwindRegistersRestore.S Thu Sep 28 23:09:09 2017
@@ -11,6 +11,8 @@
 
   .text
 
+#if !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__)
+
 #if defined(__i386__)
 DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind13Registers_x866jumptoEv)
 #
@@ -308,7 +310,7 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9li
   ldp    x0, x1,  [x0, #0x000]  // restore x0,x1
   ret    x30                    // jump to pc
 
-#elif defined(__arm__) && !(defined(__APPLE__) || defined(__USING_SJLJ_EXCEPTIONS__))
+#elif defined(__arm__)
 
 #if !defined(__ARM_ARCH_ISA_ARM)
   .thumb
@@ -491,5 +493,7 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9li
 
 #endif
 
+#endif /* !defined(__APPLE__) && !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=314492&r1=314491&r2=314492&view=diff
==============================================================================
--- libunwind/trunk/src/UnwindRegistersSave.S (original)
+++ libunwind/trunk/src/UnwindRegistersSave.S Thu Sep 28 23:09:09 2017
@@ -11,6 +11,8 @@
 
     .text
 
+#if !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__)
+
 #if defined(__i386__)
 
 #
@@ -289,7 +291,7 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext
   mov    x0, #0                   // return UNW_ESUCCESS
   ret
 
-#elif defined(__arm__) && !(defined(__APPLE__) || defined(__USING_SJLJ_EXCEPTIONS__))
+#elif defined(__arm__)
 
 #if !defined(__ARM_ARCH_ISA_ARM)
   .thumb
@@ -471,5 +473,7 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext
   l.sw     124(r3), r31
 #endif
 
+#endif /* !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) */
+
 NO_EXEC_STACK_DIRECTIVE