[libcxxabi] r211751 - Fix building for iOS

Nick Kledzik kledzik at apple.com
Wed Jun 25 17:25:34 PDT 2014


Author: kledzik
Date: Wed Jun 25 19:25:33 2014
New Revision: 211751

URL: http://llvm.org/viewvc/llvm-project?rev=211751&view=rev
Log:
Fix building for iOS

Modified:
    libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S

Modified: libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S?rev=211751&r1=211750&r2=211751&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S (original)
+++ libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S Wed Jun 25 19:25:33 2014
@@ -308,7 +308,7 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9li
   ldp    x0, x1,  [x0, #0x000]  ; restore x0,x1
   ret    lr            ; jump to pc
 
-#elif __arm__
+#elif __arm__ && !__APPLE__
 
 @
 @ void libunwind::Registers_arm::restoreCoreAndJumpTo()





More information about the cfe-commits mailing list