Commit c73345d9 authored by Stefan Lankes's avatar Stefan Lankes
Browse files

use llvm_asm! instead of asm! to compile on nightly

parent 507f4f59
......@@ -199,5 +199,5 @@ pub unsafe fn boot_kernel(
"Jumping to HermitCore Application Entry Point at {:#X}",
entry_point
);
asm!("jmp *$0" :: "r"(entry_point), "{rdi}"(&BOOT_INFO as *const _ as usize) : "memory" : "volatile");
llvm_asm!("jmp *$0" :: "r"(entry_point), "{rdi}"(&BOOT_INFO as *const _ as usize) : "memory" : "volatile");
}
......@@ -157,7 +157,7 @@ impl<S: PageSize> Page<S> {
/// Flushes this page from the TLB of this CPU.
fn flush_from_tlb(&self) {
unsafe {
asm!("invlpg ($0)" :: "r"(self.virtual_address) : "memory" : "volatile");
llvm_asm!("invlpg ($0)" :: "r"(self.virtual_address) : "memory" : "volatile");
}
}
......
......@@ -8,6 +8,6 @@
/// The halt function stops the processor until the next interrupt arrives
pub fn halt() {
unsafe {
asm!("hlt" :::: "volatile");
llvm_asm!("hlt" :::: "volatile");
}
}
......@@ -5,9 +5,9 @@
// http://opensource.org/licenses/MIT>, at your option. This file may not be
// copied, modified, or distributed except according to those terms.
#![feature(asm)]
#![feature(const_fn)]
#![feature(lang_items)]
#![feature(llvm_asm)]
#![feature(panic_info_message)]
#![feature(specialization)]
#![feature(naked_functions)]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment