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

[Justin Bogner]

Chris Bieneman <beanz at apple.com> writes:
> This is one of many changes needed for compiler-rt to get it building on iOS.
>
> Darwin doesn't have _Unwind_VRS_Get, instead use _Unwind_GetIP directly.
>
> Note: this change does not enable building for iOS, as there are more
> changes to come.

LGTM.

> http://reviews.llvm.org/D10516
>
> Files:
>   lib/sanitizer_common/sanitizer_unwind_posix_libcdep.cc
>
> Index: lib/sanitizer_common/sanitizer_unwind_posix_libcdep.cc
> ===================================================================
> --- lib/sanitizer_common/sanitizer_unwind_posix_libcdep.cc
> +++ 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__) && !defined(__APPLE__)
>    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/
> Index: lib/sanitizer_common/sanitizer_unwind_posix_libcdep.cc
> ===================================================================
> --- lib/sanitizer_common/sanitizer_unwind_posix_libcdep.cc
> +++ 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__) && !defined(__APPLE__)
>    uptr val;
>    _Unwind_VRS_Result res = _Unwind_VRS_Get(ctx, _UVRSC_CORE,
>        15 /* r15 = PC */, _UVRSD_UINT32, &val);
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits