[PATCH] Working on reconciling out-of-tree patches to compiler-rt for building for iOS.

[Phabricator]

REPOSITORY
  rL LLVM

http://reviews.llvm.org/D10516

Files:
  compiler-rt/trunk/lib/sanitizer_common/sanitizer_unwind_posix_libcdep.cc

Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_unwind_posix_libcdep.cc
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_unwind_posix_libcdep.cc
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_unwind_posix_libcdep.cc
@@ -82,7 +82,7 @@
 #endif
 
 uptr Unwind_GetIP(struct _Unwind_Context *ctx) {
-#ifdef __arm__
+#if defined(__arm__) && !SANITIZER_MAC
   uptr val;
   _Unwind_VRS_Result res = _Unwind_VRS_Get(ctx, _UVRSC_CORE,
       15 /* r15 = PC */, _UVRSD_UINT32, &val);

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D10516.28290.patch
Type: text/x-patch
Size: 559 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150623/50e4ce10/attachment.bin>