]> git.lizzy.rs Git - rust.git/commitdiff
Fix build of thumbv7a-pc-windows-msvc
authorArlo Siemsen <arsiem@microsoft.com>
Fri, 4 Nov 2022 20:24:57 +0000 (13:24 -0700)
committerArlo Siemsen <arsiem@microsoft.com>
Fri, 4 Nov 2022 21:35:56 +0000 (14:35 -0700)
library/panic_unwind/src/lib.rs

index 1eb4f378904a9894efcddba25f6138e5aac883c9..7e7180a38e2f23d6c76b3886a503ebb20832bec6 100644 (file)
@@ -42,7 +42,8 @@
         // L4Re is unix family but does not yet support unwinding.
         #[path = "dummy.rs"]
         mod real_imp;
-    } else if #[cfg(target_env = "msvc")] {
+    } else if #[cfg(all(target_env = "msvc", not(target_arch = "arm")))] {
+        // LLVM does not support unwinding on 32 bit ARM msvc (thumbv7a-pc-windows-msvc)
         #[path = "seh.rs"]
         mod real_imp;
     } else if #[cfg(any(