diff options
| author | Vadim Chugunov <vadimcn@gmail.com> | 2015-10-31 18:47:38 -0700 |
|---|---|---|
| committer | Vadim Chugunov <vadimcn@gmail.com> | 2015-10-31 18:52:37 -0700 |
| commit | 0332ee9f6336c17e8e8e7524cd2db1c6a92c1a30 (patch) | |
| tree | 45f6df70d6c4e23fe6c4628476a7254fcfc15803 /src/libstd/sys/common | |
| parent | afc3046515064e9f40d9f6ad491b4791c3d0c8af (diff) | |
| download | rust-0332ee9f6336c17e8e8e7524cd2db1c6a92c1a30.tar.gz rust-0332ee9f6336c17e8e8e7524cd2db1c6a92c1a30.zip | |
Fix stage0 ICE caused by the old _Unwind_Resume override trickery.
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/libunwind.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/sys/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs index feb05c7b560..75bb11216e1 100644 --- a/src/libstd/sys/common/libunwind.rs +++ b/src/libstd/sys/common/libunwind.rs @@ -131,6 +131,8 @@ extern "C" { pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); + // remove cfg after new snapshot + #[cfg(not(all(stage0, target_os="windows", target_arch="x86_64")))] #[unwind] pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; } |