Explicitly look for 'thumb-mode' before using __fastfail on 'arm'

rust-lang · Aug 29, 2020 · d931e97 · d931e97
1 parent 9e2228d
commit d931e97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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);

diff --git a/library/std/src/sys/windows/mod.rs b/library/std/src/sys/windows/mod.rs
@@ -312,7 +312,7 @@ pub fn abort_internal() -> ! {
             if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
                 asm!("int $$0x29", in("ecx") FAST_FAIL_FATAL_APP_EXIT);
                 crate::intrinsics::unreachable();
-            } 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);
                 crate::intrinsics::unreachable();
             } else if #[cfg(target_arch = "aarch64")] {