about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2019-11-15 11:52:46 +0100
committerRalf Jung <post@ralfj.de>2019-11-15 12:54:08 +0100
commitb6d93d9167ea4b8d28d27429a0c14e8dc0060d86 (patch)
tree0f01c97471c8b6021032da7c3b72c92357b7d5f1
parent9e8c4e6fb1c952048fb823e59f4c9c6487bf9a58 (diff)
downloadrust-b6d93d9167ea4b8d28d27429a0c14e8dc0060d86.tar.gz
rust-b6d93d9167ea4b8d28d27429a0c14e8dc0060d86.zip
libpanic_unwind for Miri: make sure we have the SEH lang items when needed
-rw-r--r--src/libpanic_unwind/lib.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libpanic_unwind/lib.rs b/src/libpanic_unwind/lib.rs
index d97a7a8a87d..c69399a87d9 100644
--- a/src/libpanic_unwind/lib.rs
+++ b/src/libpanic_unwind/lib.rs
@@ -39,6 +39,10 @@ cfg_if::cfg_if! {
     if #[cfg(miri)] {
         #[path = "miri.rs"]
         mod imp;
+        // On MSVC we need the SEH lang items as well...
+        #[cfg(all(target_env = "msvc", not(target_arch = "aarch64")))]
+        #[allow(unused)]
+        mod seh;
     } else if #[cfg(target_os = "emscripten")] {
         #[path = "emcc.rs"]
         mod imp;