Skip to content

Commit 321f015

Browse files
committed
Auto merge of rust-lang#104607 - matthiaskrgr:rollup-9s589me, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang#103117 (Use `IsTerminal` in place of `atty`) - rust-lang#103969 (Partial support for running UI tests with `download-rustc`) - rust-lang#103989 (Fix build of std for thumbv7a-pc-windows-msvc) - rust-lang#104076 (fix sysroot issue which appears for ci downloaded rustc) - rust-lang#104469 (Make "long type" printing type aware and trim types in E0275) - rust-lang#104497 (detect () to avoid redundant <> suggestion for type) - rust-lang#104577 (Don't focus on notable trait parent when hiding it) - rust-lang#104587 (Update cargo) - rust-lang#104593 (Improve spans for RPITIT object-safety errors) - rust-lang#104604 (Migrate top buttons style to CSS variables) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8c93b48 + 0bcb388 commit 321f015

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

panic_unwind/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ cfg_if::cfg_if! {
4242
// L4Re is unix family but does not yet support unwinding.
4343
#[path = "dummy.rs"]
4444
mod real_imp;
45-
} else if #[cfg(target_env = "msvc")] {
45+
} else if #[cfg(all(target_env = "msvc", not(target_arch = "arm")))] {
46+
// LLVM does not support unwinding on 32 bit ARM msvc (thumbv7a-pc-windows-msvc)
4647
#[path = "seh.rs"]
4748
mod real_imp;
4849
} else if #[cfg(any(

0 commit comments

Comments
 (0)