diff options
| author | Ryan Levick <ryan.levick@gmail.com> | 2020-08-28 17:40:56 +0200 |
|---|---|---|
| committer | Ryan Levick <ryan.levick@gmail.com> | 2020-08-28 17:40:56 +0200 |
| commit | 9e2228d2d07c77b8323a3f3e1bf82badddd7bfec (patch) | |
| tree | 75e9443fc8aa07aa47212e9b9770361a23127735 /library | |
| parent | 8bcc4d617869f190c9f7fc0c301e8328f719d85a (diff) | |
| download | rust-9e2228d2d07c77b8323a3f3e1bf82badddd7bfec.tar.gz rust-9e2228d2d07c77b8323a3f3e1bf82badddd7bfec.zip | |
Back to opcode for 32 bit ARM __fastfail
Diffstat (limited to 'library')
| -rw-r--r-- | library/panic_abort/src/lib.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/windows/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/panic_abort/src/lib.rs b/library/panic_abort/src/lib.rs index a09234e09ff..a37bfa45173 100644 --- a/library/panic_abort/src/lib.rs +++ b/library/panic_abort/src/lib.rs @@ -64,7 +64,7 @@ pub unsafe extern "C" fn __rust_start_panic(_payload: usize) -> u32 { 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")] { - asm!("brk 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT); + 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); } else { diff --git a/library/std/src/sys/windows/mod.rs b/library/std/src/sys/windows/mod.rs index 03ddc3e6461..d3b9a626a9e 100644 --- a/library/std/src/sys/windows/mod.rs +++ b/library/std/src/sys/windows/mod.rs @@ -313,7 +313,7 @@ pub fn abort_internal() -> ! { asm!("int $$0x29", in("ecx") FAST_FAIL_FATAL_APP_EXIT); crate::intrinsics::unreachable(); } else if #[cfg(target_arch = "arm")] { - asm!("brk 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT); + asm!(".inst 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT); crate::intrinsics::unreachable(); } else if #[cfg(target_arch = "aarch64")] { asm!("brk 0xF003", in("x0") FAST_FAIL_FATAL_APP_EXIT); |