Merge branch 'LD_SO_ASM_REM' into 'master'

Get rid of assembly code in call_inits_finis See merge request redox-os/relibc!282
2020-06-20 13:13:26 +00:00
parent 73e1d6307b 0977133cc9
commit d7089a09bf
1 changed files with 2 additions and 12 deletions
@@ -865,16 +865,6 @@ impl Linker {
 }

 unsafe extern "C" fn call_inits_finis(addr: usize) {
-    #[cfg(target_arch = "x86_64")]
-    asm!("
-        cmp qword ptr [rdi], 0
-        je end
-        call [rdi]
-end:    nop
-        "
-        :
-        :
-        :
-        : "intel", "volatile"
-    );
+    let func = transmute::<usize, *const Option<extern "C" fn()>>(addr);
+    (*func).map(|x| x());
 }