From 2ccbfd1b8e87d9e16738583f1cb19868ea5ad479 Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 1 Feb 2015 02:29:58 +0000 Subject: Revert r278017 (MFC of r273381 and r276417) and r278018 (MFC of r273434) until I can figure out why it leads to link failures in some scenarios. --- contrib/libcxxrt/unwind-arm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/libcxxrt/unwind-arm.h') diff --git a/contrib/libcxxrt/unwind-arm.h b/contrib/libcxxrt/unwind-arm.h index 52e563e..8c1fa16 100644 --- a/contrib/libcxxrt/unwind-arm.h +++ b/contrib/libcxxrt/unwind-arm.h @@ -218,6 +218,6 @@ _Unwind_Reason_Code name(_Unwind_State state,\ break;\ }\ }\ - _Unwind_SetGR (context, 12, reinterpret_cast(exceptionObject));\ + _Unwind_SetGR (context, 12, (unsigned long)exceptionObject);\ #define CALL_PERSONALITY_FUNCTION(name) name(state,exceptionObject,context) -- cgit v1.1