Merge branch 'fix_arm64' into 'master'
Fix compilation on arm64 See merge request redox-os/relibc!735
This commit is contained in:
+2
-2
@@ -147,7 +147,7 @@ pub unsafe fn init(
|
||||
tp = val;
|
||||
}
|
||||
#[cfg(all(target_os = "redox", target_arch = "aarch64"))]
|
||||
{
|
||||
unsafe {
|
||||
core::arch::asm!(
|
||||
"mrs {}, tpidr_el0",
|
||||
out(reg) tp,
|
||||
@@ -180,7 +180,7 @@ pub unsafe fn init(
|
||||
tp = env.fsbase as usize;
|
||||
}
|
||||
#[cfg(all(target_os = "redox", target_arch = "riscv64"))]
|
||||
{
|
||||
unsafe {
|
||||
core::arch::asm!(
|
||||
"mv {}, tp",
|
||||
out(reg) tp,
|
||||
|
||||
Reference in New Issue
Block a user