diff options
| author | Valerii Hiora <valerii.hiora@gmail.com> | 2014-06-13 10:18:12 +0300 |
|---|---|---|
| committer | Valerii Hiora <valerii.hiora@gmail.com> | 2014-06-13 10:18:12 +0300 |
| commit | ebc6474668ec60cc793af0f48143bf33d984deb4 (patch) | |
| tree | 5e03b151befb417b1d5262b45ce19a69b4fe5651 /src/librustrt | |
| parent | 70a79a9e0527fab74d8c2d2b49886b41bdd878f5 (diff) | |
| download | rust-ebc6474668ec60cc793af0f48143bf33d984deb4.tar.gz rust-ebc6474668ec60cc793af0f48143bf33d984deb4.zip | |
Cosmetic fixes & comments
Diffstat (limited to 'src/librustrt')
| -rw-r--r-- | src/librustrt/libunwind.rs | 12 | ||||
| -rw-r--r-- | src/librustrt/unwind.rs | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/librustrt/libunwind.rs b/src/librustrt/libunwind.rs index 50c2aba2b5c..2d58c1bee15 100644 --- a/src/librustrt/libunwind.rs +++ b/src/librustrt/libunwind.rs @@ -97,10 +97,14 @@ extern {} extern "C" { // iOS on armv7 uses SjLj exceptions and requires to link // agains corresponding routine (..._SjLj_...) - // So here we just skip linking for iOS #[cfg(not(target_os = "ios", target_arch = "arm"))] pub fn _Unwind_RaiseException(exception: *_Unwind_Exception) - -> _Unwind_Reason_Code; + -> _Unwind_Reason_Code; + + #[cfg(target_os = "ios", target_arch = "arm")] + fn _Unwind_SjLj_RaiseException(e: *_Unwind_Exception) + -> _Unwind_Reason_Code; + pub fn _Unwind_DeleteException(exception: *_Unwind_Exception); } @@ -111,9 +115,5 @@ extern "C" { #[inline(always)] pub unsafe fn _Unwind_RaiseException(exc: *_Unwind_Exception) -> _Unwind_Reason_Code { - extern "C" { - fn _Unwind_SjLj_RaiseException(e: *_Unwind_Exception) - -> _Unwind_Reason_Code; } - _Unwind_SjLj_RaiseException(exc) } diff --git a/src/librustrt/unwind.rs b/src/librustrt/unwind.rs index e60c50f0adb..5b941c9d5aa 100644 --- a/src/librustrt/unwind.rs +++ b/src/librustrt/unwind.rs @@ -303,7 +303,6 @@ pub mod eabi { use libc::c_int; extern "C" { - #[cfg(target_os = "ios", target_arch = "arm")] fn __gcc_personality_sj0(version: c_int, actions: uw::_Unwind_Action, exception_class: uw::_Unwind_Exception_Class, |