diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 15:54:59 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 15:54:59 -0800 |
| commit | 2f4401a79e96917f78876c3e09b8d31754a26f70 (patch) | |
| tree | 8ac45e1d7b302a9f0aaa7e9b9e74aff01965a93d /system/lib/libcxxabi/src/cxa_exception.cpp | |
| parent | 2c8c19f60585d4e8cb78af119faba664a35e2268 (diff) | |
| parent | 160cc728e0839e441897d951fa61020bc2176717 (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/lib/libcxxabi/src/cxa_exception.cpp')
| -rw-r--r-- | system/lib/libcxxabi/src/cxa_exception.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/lib/libcxxabi/src/cxa_exception.cpp b/system/lib/libcxxabi/src/cxa_exception.cpp index b866f9e4..1c362993 100644 --- a/system/lib/libcxxabi/src/cxa_exception.cpp +++ b/system/lib/libcxxabi/src/cxa_exception.cpp @@ -466,9 +466,9 @@ __cxa_rethrow() globals->caughtExceptions = 0; } #if __arm__ - (void) _Unwind_SjLj_Resume_or_Rethrow(&exception_header->unwindHeader); + _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); #else - (void)_Unwind_RaiseException(&exception_header->unwindHeader); + _Unwind_RaiseException(&exception_header->unwindHeader); #endif // If we get here, some kind of unwinding error has occurred. |