From fb48e1d39ce4d806f6c05dfe2805fa4c5d63d0de Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 26 Feb 2015 07:42:16 +0000 Subject: [PATCH] Since newer versions of compiler-rt require unwind.h, and we want to use the copy in libcxxrt for it, fix the arm-specific header to define the _Unwind_Action type. Submitted by: andrew MFC after: 3 days --- contrib/libcxxrt/unwind-arm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/libcxxrt/unwind-arm.h b/contrib/libcxxrt/unwind-arm.h index 52e563e41b62..23f2b79f7e6a 100644 --- a/contrib/libcxxrt/unwind-arm.h +++ b/contrib/libcxxrt/unwind-arm.h @@ -36,6 +36,8 @@ _URC_FATAL_PHASE1_ERROR = _URC_FAILURE } _Unwind_Reason_Code; +typedef int _Unwind_Action; + typedef uint32_t _Unwind_State; #ifdef __clang__ static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME = 0;