diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 22:11:45 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 22:42:21 -0700 |
| commit | bbef8893f798452874f15374992804c8184c32c5 (patch) | |
| tree | 1812eacb670c43d35cbe6d5b5a522c3f4ae63362 /src/libstd | |
| parent | 00ac2c0550d98609c813da07ac400eaa4aaf1730 (diff) | |
| parent | b6b4f5a0e7a98d918d7c5a56e291c0063f257f1e (diff) | |
| download | rust-bbef8893f798452874f15374992804c8184c32c5.tar.gz rust-bbef8893f798452874f15374992804c8184c32c5.zip | |
rollup merge of #27676: alexcrichton/msvc-unwind
This commit leverages the runtime support for DWARF exception info added in #27210 to enable unwinding by default on 64-bit MSVC. This also additionally adds a few minor fixes here and there in the test harness and such to get `make check` entirely passing on 64-bit MSVC: * The invocation of `maketest.py` now works with spaces/quotes in CC * debuginfo tests are disabled on MSVC * A link error for librustc was hacked around (see #27438)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rt/unwind/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/rt/unwind/mod.rs b/src/libstd/rt/unwind/mod.rs index bb43eec8db1..4feb2d49a98 100644 --- a/src/libstd/rt/unwind/mod.rs +++ b/src/libstd/rt/unwind/mod.rs @@ -77,18 +77,18 @@ use sys_common::mutex::Mutex; // implementations. One goes through SEH on Windows and the other goes through // libgcc via the libunwind-like API. -// *-pc-windows-msvc -#[cfg(all(windows, target_env = "msvc"))] +// i686-pc-windows-msvc +#[cfg(all(windows, target_arch = "x86", target_env = "msvc"))] #[path = "seh.rs"] #[doc(hidden)] pub mod imp; -// x86_64-pc-windows-gnu -#[cfg(all(windows, target_arch="x86_64", target_env="gnu"))] +// x86_64-pc-windows-* +#[cfg(all(windows, target_arch = "x86_64"))] #[path = "seh64_gnu.rs"] #[doc(hidden)] pub mod imp; // i686-pc-windows-gnu and all others -#[cfg(any(unix, all(windows, target_arch="x86", target_env="gnu")))] +#[cfg(any(unix, all(windows, target_arch = "x86", target_env = "gnu")))] #[path = "gcc.rs"] #[doc(hidden)] pub mod imp; |