diff options
| author | Simonas Kazlauskas <git@kazlauskas.me> | 2015-10-02 22:19:51 +0300 |
|---|---|---|
| committer | Simonas Kazlauskas <git@kazlauskas.me> | 2015-10-05 23:50:04 +0300 |
| commit | a7f2a7881dc724fd9e36e31c8bf969225f72f792 (patch) | |
| tree | 98706506135e88d024a99e32a81b7bae62bbdd7b /src/libstd/sys | |
| parent | cefadf05f9319f01b0245de72f4e5941a046b0e9 (diff) | |
| download | rust-a7f2a7881dc724fd9e36e31c8bf969225f72f792.tar.gz rust-a7f2a7881dc724fd9e36e31c8bf969225f72f792.zip | |
Fix MSVC stage0 with landing pads enabled
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/unwind/mod.rs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/libstd/sys/common/unwind/mod.rs b/src/libstd/sys/common/unwind/mod.rs index c06d7886a75..3978aeb39bc 100644 --- a/src/libstd/sys/common/unwind/mod.rs +++ b/src/libstd/sys/common/unwind/mod.rs @@ -81,8 +81,18 @@ use sys_common::mutex::Mutex; #[path = "seh.rs"] #[doc(hidden)] pub mod imp; +// SNAP: i686-pc-windows-gnu +#[cfg(all(stage0, windows, target_arch = "x86_64", target_env = "gnu"))] +#[path = "seh64_gnu.rs"] #[doc(hidden)] +pub mod imp; + +// SNAP: 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(windows, target_arch = "x86_64"))] +#[cfg(all(not(stage0), windows, target_arch = "x86_64"))] #[path = "seh64_gnu.rs"] #[doc(hidden)] pub mod imp; |