Skip to content

Commit 08ae097

Browse files
authored
Merge pull request #547 from hermit-os/rename-ld
refactor(x86_64): rename multiboot-specific files
2 parents 71e3295 + db031b3 commit 08ae097

File tree

4 files changed

+2
-2
lines changed

4 files changed

+2
-2
lines changed

src/arch/x86_64/multiboot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ unsafe extern "C" {
2626
#[allow(bad_asm_style)]
2727
mod entry {
2828
core::arch::global_asm!(
29-
include_str!("entry.s"),
29+
include_str!("entry_multiboot.s"),
3030
loader_main = sym crate::os::loader_main,
3131
);
3232
}

xtask/src/target.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ impl Target {
7979
"-Crelocation-model=static",
8080
],
8181
Self::X86_64Multiboot => &[
82-
"-Clink-arg=-Tsrc/arch/x86_64/link.ld",
82+
"-Clink-arg=-Tsrc/arch/x86_64/link_multiboot.ld",
8383
"-Crelocation-model=static",
8484
],
8585
Self::X86_64Uefi => &[],

0 commit comments

Comments
 (0)