diff options
| author | dim <dim@FreeBSD.org> | 2015-02-01 02:29:58 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-01 02:29:58 +0000 |
| commit | 2ccbfd1b8e87d9e16738583f1cb19868ea5ad479 (patch) | |
| tree | a0f122f4b76eb51437a7dd525aaf7fc88d4f887f /contrib/libcxxrt/unwind-arm.h | |
| parent | 111a0cf771f31b0fdae5d6e0e7cbd3277e702172 (diff) | |
| download | FreeBSD-src-2ccbfd1b8e87d9e16738583f1cb19868ea5ad479.zip FreeBSD-src-2ccbfd1b8e87d9e16738583f1cb19868ea5ad479.tar.gz | |
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.
Diffstat (limited to 'contrib/libcxxrt/unwind-arm.h')
| -rw-r--r-- | contrib/libcxxrt/unwind-arm.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<unsigned long>(exceptionObject));\ + _Unwind_SetGR (context, 12, (unsigned long)exceptionObject);\ #define CALL_PERSONALITY_FUNCTION(name) name(state,exceptionObject,context) |
