Skip to content

Commit 9e2228d

Browse files
committed
Back to opcode for 32 bit ARM __fastfail
1 parent 8bcc4d6 commit 9e2228d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

library/panic_abort/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub unsafe extern "C" fn __rust_start_panic(_payload: usize) -> u32 {
6464
if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
6565
asm!("int $$0x29", in("ecx") FAST_FAIL_FATAL_APP_EXIT);
6666
} else if #[cfg(target_arch = "arm")] {
67-
asm!("brk 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT);
67+
asm!(".inst 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT);
6868
} else if #[cfg(target_arch = "aarch64")] {
6969
asm!("brk 0xF003", in("x0") FAST_FAIL_FATAL_APP_EXIT);
7070
} else {

library/std/src/sys/windows/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ pub fn abort_internal() -> ! {
313313
asm!("int $$0x29", in("ecx") FAST_FAIL_FATAL_APP_EXIT);
314314
crate::intrinsics::unreachable();
315315
} else if #[cfg(target_arch = "arm")] {
316-
asm!("brk 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT);
316+
asm!(".inst 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT);
317317
crate::intrinsics::unreachable();
318318
} else if #[cfg(target_arch = "aarch64")] {
319319
asm!("brk 0xF003", in("x0") FAST_FAIL_FATAL_APP_EXIT);

0 commit comments

Comments
 (0)