fix: mangle loader_main

Author: mkroening

src/arch/aarch64/entry.rs

@@ -5,10 +5,6 @@ use core::arch::{asm, global_asm};
 use aarch64_cpu::registers::{Writeable, SCTLR_EL1};
 use log::info;
 
-extern "C" {
-	fn loader_main();
-}
-
 const BOOT_CORE_ID: u64 = 0; // ID of CPU for booting on SMP systems - this might be board specific in the future
 
 /*
@@ -189,10 +185,8 @@ unsafe fn pre_init() -> ! {
 
 	// Enter loader
 	unsafe {
-		loader_main();
+		crate::os::loader_main();
 	}
-
-	unreachable!()
 }
 
 pub unsafe fn wait_forever() -> ! {

src/arch/x86_64/entry.s

@@ -187,8 +187,7 @@ start64:
     add rsp, BOOT_STACK_SIZE-16
 
     # jump to the boot processors's C code
-    .extern loader_main
-    jmp loader_main
+    jmp {loader_main}
     jmp start64+0x28
 
 .section .data

src/arch/x86_64/entry_fc.s

@@ -69,8 +69,7 @@ start64:
     add rsp, BOOT_STACK_SIZE-16
 
     # jump to the boot processors's C code
-    .extern loader_main
-    jmp loader_main
+    jmp {loader_main}
 invalid:
     jmp invalid
 

src/arch/x86_64/firecracker.rs

@@ -26,7 +26,10 @@ extern "C" {
 }
 
 mod entry {
-	core::arch::global_asm!(include_str!("entry_fc.s"));
+	core::arch::global_asm!(
+		include_str!("entry_fc.s"),
+		loader_main = sym crate::os::loader_main,
+	);
 }
 
 pub fn find_kernel() -> &'static [u8] {

src/arch/x86_64/multiboot.rs

@@ -25,7 +25,10 @@ extern "C" {
 
 #[allow(bad_asm_style)]
 mod entry {
-	core::arch::global_asm!(include_str!("entry.s"));
+	core::arch::global_asm!(
+		include_str!("entry.s"),
+		loader_main = sym crate::os::loader_main,
+	);
 }
 
 struct Mem;

src/os/none/mod.rs

@@ -18,7 +18,6 @@ extern "C" {
 
 /// Entry Point of the BIOS Loader
 /// (called from entry.asm or entry.rs)
-#[no_mangle]
 pub(crate) unsafe extern "C" fn loader_main() -> ! {
 	crate::log::init();