diff options
| author | Arlo Siemsen <arsiem@microsoft.com> | 2022-11-04 13:24:57 -0700 |
|---|---|---|
| committer | Arlo Siemsen <arsiem@microsoft.com> | 2022-11-04 14:35:56 -0700 |
| commit | 7c602360364ac21ee17d5fd81dc142ecb67b56a5 (patch) | |
| tree | 1fb0fd094ec2406792313b0e79911548f375ce14 /library/panic_unwind/src | |
| parent | c2a5c3a50fc3fb6d16cd140f55f7db61cbf08a01 (diff) | |
Fix build of thumbv7a-pc-windows-msvc
Diffstat (limited to 'library/panic_unwind/src')
| -rw-r--r-- | library/panic_unwind/src/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/library/panic_unwind/src/lib.rs b/library/panic_unwind/src/lib.rs index 1eb4f378904..7e7180a38e2 100644 --- a/library/panic_unwind/src/lib.rs +++ b/library/panic_unwind/src/lib.rs @@ -42,7 +42,8 @@ cfg_if::cfg_if! { // 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( |