diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2019-10-21 02:46:04 +0100 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2019-11-03 14:03:21 +0000 |
| commit | 5f1a0afd22c7f1e26782467503d32d026c55fc0c (patch) | |
| tree | 7e7fc14e9dadb4770e40294ec56cdc54642e7db4 /src/libpanic_unwind/lib.rs | |
| parent | 9a8bb3a26e8a058be64a0d778b3b168bc9b74caa (diff) | |
| download | rust-5f1a0afd22c7f1e26782467503d32d026c55fc0c.tar.gz rust-5f1a0afd22c7f1e26782467503d32d026c55fc0c.zip | |
Allow foreign exceptions to unwind through Rust code
Diffstat (limited to 'src/libpanic_unwind/lib.rs')
| -rw-r--r-- | src/libpanic_unwind/lib.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libpanic_unwind/lib.rs b/src/libpanic_unwind/lib.rs index 2089a02083c..50d067b56e4 100644 --- a/src/libpanic_unwind/lib.rs +++ b/src/libpanic_unwind/lib.rs @@ -5,9 +5,8 @@ //! essentially gets categorized into three buckets currently: //! //! 1. MSVC targets use SEH in the `seh.rs` file. -//! 2. The 64-bit MinGW target half-uses SEH and half-use gcc-like information -//! in the `seh64_gnu.rs` module. -//! 3. All other targets use libunwind/libgcc in the `gcc/mod.rs` module. +//! 2. Emscripten uses C++ exceptions in the `emcc.rs` file. +//! 3. All other targets use libunwind/libgcc in the `gcc.rs` file. //! //! More documentation about each implementation can be found in the respective //! module. @@ -52,9 +51,6 @@ cfg_if::cfg_if! { } else if #[cfg(target_env = "msvc")] { #[path = "seh.rs"] mod imp; - } else if #[cfg(all(windows, target_arch = "x86_64", target_env = "gnu"))] { - #[path = "seh64_gnu.rs"] - mod imp; } else { // Rust runtime's startup objects depend on these symbols, so make them public. #[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))] |
