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
git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@314492 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/src/UnwindRegistersRestore.S b/src/UnwindRegistersRestore.S
index e629e25..a90d5f5 100644
--- a/src/UnwindRegistersRestore.S
+++ b/src/UnwindRegistersRestore.S
@@ -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 @@
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 @@
#endif
+#endif /* !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) */
+
NO_EXEC_STACK_DIRECTIVE
diff --git a/src/UnwindRegistersSave.S b/src/UnwindRegistersSave.S
index a0f864e..7f5a9ac 100644
--- a/src/UnwindRegistersSave.S
+++ b/src/UnwindRegistersSave.S
@@ -11,6 +11,8 @@
.text
+#if !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__)
+
#if defined(__i386__)
#
@@ -289,7 +291,7 @@
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 @@
l.sw 124(r3), r31
#endif
+#endif /* !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) */
+
NO_EXEC_STACK_DIRECTIVE