about summary refs log tree commit diff
path: root/library/std/src/sys/windows
diff options
context:
space:
mode:
authorRyan Levick <ryan.levick@gmail.com>2020-08-28 11:22:16 +0200
committerRyan Levick <ryan.levick@gmail.com>2020-08-28 11:22:21 +0200
commit8bcc4d617869f190c9f7fc0c301e8328f719d85a (patch)
tree50c158ee96ea3ff471bf321ba3b461d09c4e23ed /library/std/src/sys/windows
parent970e7793bfefd3d93034869ef8672affa02fff24 (diff)
downloadrust-8bcc4d617869f190c9f7fc0c301e8328f719d85a.tar.gz
rust-8bcc4d617869f190c9f7fc0c301e8328f719d85a.zip
Switch to asm! macro and use brk instruction on ARM
Diffstat (limited to 'library/std/src/sys/windows')
-rw-r--r--library/std/src/sys/windows/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/sys/windows/mod.rs b/library/std/src/sys/windows/mod.rs
index 8fbd43ad5a5..03ddc3e6461 100644
--- a/library/std/src/sys/windows/mod.rs
+++ b/library/std/src/sys/windows/mod.rs
@@ -310,13 +310,13 @@ pub fn abort_internal() -> ! {
     unsafe {
         cfg_if::cfg_if! {
             if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
-                llvm_asm!("int $$0x29" :: "{ecx}"(FAST_FAIL_FATAL_APP_EXIT) ::: volatile);
+                asm!("int $$0x29", in("ecx") FAST_FAIL_FATAL_APP_EXIT);
                 crate::intrinsics::unreachable();
             } else if #[cfg(target_arch = "arm")] {
-                llvm_asm!(".inst 0xDEFB" :: "{r0}"(FAST_FAIL_FATAL_APP_EXIT) ::: volatile);
+                asm!("brk 0xDEFB", in("r0") FAST_FAIL_FATAL_APP_EXIT);
                 crate::intrinsics::unreachable();
             } else if #[cfg(target_arch = "aarch64")] {
-                llvm_asm!(".inst 0xF003" :: "{x0}"(FAST_FAIL_FATAL_APP_EXIT) ::: volatile);
+                asm!("brk 0xF003", in("x0") FAST_FAIL_FATAL_APP_EXIT);
                 crate::intrinsics::unreachable();
             }
         }