Skip to content

Commit 747f29f

Browse files
authoredNov 19, 2022
Rollup merge of #103989 - arlosi:arm32-panic, r=Amanieu
Fix build of std for thumbv7a-pc-windows-msvc Attempting to build std for the tier-3 target `thumbv7a-pc-windows-msvc` fails with the following error: ``` Building stage1 std artifacts (x86_64-pc-windows-msvc -> thumbv7a-pc-windows-msvc) .. LLVM ERROR: WinEH not implemented for this target error: could not compile `panic_unwind` ``` EH (unwinding) is not supported by LLVM for 32 bit arm msvc targets. This changes panic unwind to use the dummy implementation for `thumbv7a-pc-windows-msvc`.
2 parents 4451e28 + 7c60236 commit 747f29f

File tree

1 file changed

+2
-1
lines changed
  • library/panic_unwind/src

1 file changed

+2
-1
lines changed
 

‎library/panic_unwind/src/lib.rs

+2-1
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)
Please sign in to comment.