diff options
| author | Ryan Levick <ryan.levick@gmail.com> | 2020-08-29 12:30:49 +0200 |
|---|---|---|
| committer | Ryan Levick <ryan.levick@gmail.com> | 2020-08-29 12:30:49 +0200 |
| commit | d931e974029a3475bd6712ca8d3bc9cb9dfe558f (patch) | |
| tree | d253b952615c0e7882b1551c2f28e3e1f4409b7c /library/panic_abort | |
| parent | 9e2228d2d07c77b8323a3f3e1bf82badddd7bfec (diff) | |
| download | rust-d931e974029a3475bd6712ca8d3bc9cb9dfe558f.tar.gz rust-d931e974029a3475bd6712ca8d3bc9cb9dfe558f.zip | |
Explicitly look for 'thumb-mode' before using __fastfail on 'arm'
Diffstat (limited to 'library/panic_abort')
| -rw-r--r-- | library/panic_abort/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/panic_abort/src/lib.rs b/library/panic_abort/src/lib.rs index a37bfa45173..31058a2b096 100644 --- a/library/panic_abort/src/lib.rs +++ b/library/panic_abort/src/lib.rs @@ -63,7 +63,7 @@ pub unsafe extern "C" fn __rust_start_panic(_payload: usize) -> u32 { cfg_if::cfg_if! { if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] { asm!("int $$0x29", in("ecx") FAST_FAIL_FATAL_APP_EXIT); - } else if #[cfg(target_arch = "arm")] { + } else if #[cfg(all(target_arch = "arm", target_feature = "thumb-mode"))] { asm!(".inst 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT); } else if #[cfg(target_arch = "aarch64")] { asm!("brk 0xF003", in("x0") FAST_FAIL_FATAL_APP_EXIT); |