From a7f2a7881dc724fd9e36e31c8bf969225f72f792 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 2 Oct 2015 22:19:51 +0300 Subject: [PATCH] Fix MSVC stage0 with landing pads enabled --- src/libstd/sys/common/unwind/mod.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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;