diff options
| author | bors <bors@rust-lang.org> | 2015-10-05 21:47:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-05 21:47:47 +0000 |
| commit | 6843ea4a46f1479b5f33d0d46512083f432d6251 (patch) | |
| tree | 6737971f5148a481c56451610695969a3a918fac /src/libstd/sys | |
| parent | c2be91ede0a6f1cbda3c14488c93abe6c7ee5f9c (diff) | |
| parent | a7f2a7881dc724fd9e36e31c8bf969225f72f792 (diff) | |
| download | rust-6843ea4a46f1479b5f33d0d46512083f432d6251.tar.gz rust-6843ea4a46f1479b5f33d0d46512083f432d6251.zip | |
Auto merge of #28717 - nagisa:optional-no-landing-pads, r=alexcrichton
Part of #28710 Landing pads during stage0 are now enabled by defaullt. Since this has its downsides and upsides either way, I made it possible to change the option through configure.
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; |