about summary refs log tree commit diff
path: root/library/panic_abort
diff options
context:
space:
mode:
authorDaniel Paoliello <danpao@microsoft.com>2024-03-27 10:49:21 -0700
committerDaniel Paoliello <danpao@microsoft.com>2024-04-15 16:05:16 -0700
commit32f5ca4be7fc71274879800cb51c90ccdb7f35a5 (patch)
tree298f4112b6fd1c7b1896b2cb39fea90ca674ebb6 /library/panic_abort
parent99d0186b1d0547eae913eff04be272c9d348b9b8 (diff)
downloadrust-32f5ca4be7fc71274879800cb51c90ccdb7f35a5.tar.gz
rust-32f5ca4be7fc71274879800cb51c90ccdb7f35a5.zip
Add support for Arm64EC to the Standard Library
Diffstat (limited to 'library/panic_abort')
-rw-r--r--library/panic_abort/src/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/library/panic_abort/src/lib.rs b/library/panic_abort/src/lib.rs
index a6d07fd1984..353de8c5c57 100644
--- a/library/panic_abort/src/lib.rs
+++ b/library/panic_abort/src/lib.rs
@@ -8,6 +8,7 @@
 #![doc(issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/")]
 #![panic_runtime]
 #![allow(unused_features)]
+#![feature(asm_experimental_arch)]
 #![feature(core_intrinsics)]
 #![feature(panic_runtime)]
 #![feature(std_internals)]
@@ -78,7 +79,7 @@ pub unsafe fn __rust_start_panic(_payload: &mut dyn PanicPayload) -> u32 {
                         core::arch::asm!("int $$0x29", in("ecx") FAST_FAIL_FATAL_APP_EXIT, options(noreturn, nostack));
                     } else if #[cfg(all(target_arch = "arm", target_feature = "thumb-mode"))] {
                         core::arch::asm!(".inst 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT, options(noreturn, nostack));
-                    } else if #[cfg(target_arch = "aarch64")] {
+                    } else if #[cfg(any(target_arch = "aarch64", target_arch = "arm64ec"))] {
                         core::arch::asm!("brk 0xF003", in("x0") FAST_FAIL_FATAL_APP_EXIT, options(noreturn, nostack));
                     } else {
                         core::intrinsics::abort();