diff options
| author | bors <bors@rust-lang.org> | 2022-12-12 16:00:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-12 16:00:14 +0000 |
| commit | 69f9c33d71c871fc16ac445211281c6e7a340943 (patch) | |
| tree | 348cdcec6049f68be8c2618d727b2facd1ccb857 /library/panic_unwind | |
| parent | 0040709e39bfa159d099ee14628ad4ac72f91406 (diff) | |
| parent | c9aa73c3b141d04aeffe7ff359f0fe2d642ff2b1 (diff) | |
| download | rust-1.66.0.tar.gz rust-1.66.0.zip | |
Auto merge of #105563 - pietroalbini:pa-stable-1.66.0, r=pietroalbini 1.66.0
[stable] Prepare 1.66.0 release This PR prepares the artifacts for the 1.66.0 release. The following PRs have been backported: * #104782 * #105023 * #104558 * #104610 * #103989 * #104650 * #105539 * #105477 r? `@ghost`
Diffstat (limited to 'library/panic_unwind')
| -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( |