diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-12-11 13:07:11 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-12-21 09:26:21 -0800 |
| commit | cd1848a1a60f40f25019e455b1050efd69707604 (patch) | |
| tree | 951659efd37119d3e132e2f05225cf9b18060c86 /src/libstd/sys/common | |
| parent | e2834a20e7c5bbfb1502f582545153dc6b25a70c (diff) | |
| download | rust-cd1848a1a60f40f25019e455b1050efd69707604.tar.gz rust-cd1848a1a60f40f25019e455b1050efd69707604.zip | |
Register new snapshots
Lots of cruft to remove!
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/libunwind.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/common/unwind/mod.rs | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/libstd/sys/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs index 75bb11216e1..feb05c7b560 100644 --- a/src/libstd/sys/common/libunwind.rs +++ b/src/libstd/sys/common/libunwind.rs @@ -131,8 +131,6 @@ 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) -> !; } diff --git a/src/libstd/sys/common/unwind/mod.rs b/src/libstd/sys/common/unwind/mod.rs index aea5acc9071..0f10e727461 100644 --- a/src/libstd/sys/common/unwind/mod.rs +++ b/src/libstd/sys/common/unwind/mod.rs @@ -88,18 +88,8 @@ use sys_common::mutex::Mutex; #[path = "seh.rs"] #[doc(hidden)] pub mod imp; -// stage0: i686-pc-windows-gnu -#[cfg(all(stage0, windows, target_arch = "x86_64", target_env = "gnu"))] -#[path = "seh64_gnu.rs"] #[doc(hidden)] -pub mod imp; - -// stage0: x86_64-pc-windows-msvc -#[cfg(all(stage0, windows, target_arch = "x86_64", target_env = "msvc"))] -#[path = "seh.rs"] #[doc(hidden)] -pub mod imp; - // x86_64-pc-windows-* -#[cfg(all(not(stage0), windows, target_arch = "x86_64"))] +#[cfg(all(windows, target_arch = "x86_64"))] #[path = "seh64_gnu.rs"] #[doc(hidden)] pub mod imp; |