replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

llvm-svn: 314492
This commit is contained in:
Martin Storsjo 2017-09-29 06:09:09 +00:00
parent 9d57dc6fb1
commit c2ec6ce65c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libunwind/src/UnwindRegistersRestore.S
View File

@ -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(_ZN9libunwind15Registers_arm646jumptoEv)
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(_ZN9libunwind14Registers_or1k6jumptoEv)
#endif
#endif /* !defined(__APPLE__) && !defined(__USING_SJLJ_EXCEPTIONS__) */
NO_EXEC_STACK_DIRECTIVE

6
libunwind/src/UnwindRegistersSave.S
View File

@ -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