From 5d45042d5dd5bf237cd3b0bc12da1bf5dd79db80 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 2 Aug 2020 13:38:29 -0600 Subject: [PATCH] Correct more asm! usages --- src/crt0/src/lib.rs | 4 ++-- src/ld_so/src/lib.rs | 4 ++-- src/platform/redox/mod.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/crt0/src/lib.rs b/src/crt0/src/lib.rs index 85f1c5a1e4..f797edd052 100644 --- a/src/crt0/src/lib.rs +++ b/src/crt0/src/lib.rs @@ -9,7 +9,7 @@ #[naked] pub unsafe extern "C" fn _start() { #[cfg(target_arch = "x86_64")] - asm!("mov rdi, rsp + llvm_asm!("mov rdi, rsp and rsp, 0xFFFFFFFFFFFFFFF0 call relibc_start" : @@ -18,7 +18,7 @@ pub unsafe extern "C" fn _start() { : "intel", "volatile" ); #[cfg(target_arch = "aarch64")] - asm!("mov x0, sp + llvm_asm!("mov x0, sp bl relibc_start" : : diff --git a/src/ld_so/src/lib.rs b/src/ld_so/src/lib.rs index e3d17c6565..d2a7bad49a 100644 --- a/src/ld_so/src/lib.rs +++ b/src/ld_so/src/lib.rs @@ -7,7 +7,7 @@ #[no_mangle] pub unsafe extern "C" fn _start() { #[cfg(target_arch = "x86_64")] - asm!(" + llvm_asm!(" # rsi = _start + 5 call next next: pop rsi @@ -41,7 +41,7 @@ next: pop rsi : "intel", "volatile" ); #[cfg(target_arch = "aarch64")] - asm!(" + llvm_asm!(" mov x0, sp bl ld_so_start TODO diff --git a/src/platform/redox/mod.rs b/src/platform/redox/mod.rs index adc0152e27..15ace45669 100644 --- a/src/platform/redox/mod.rs +++ b/src/platform/redox/mod.rs @@ -766,7 +766,7 @@ impl Pal for Sys { | syscall::CLONE_SIGHAND | syscall::CLONE_STACK; let pid; - asm!(" + llvm_asm!(" # Call clone syscall syscall