Skip to content

Commit dfa82bd

Browse files
committed
Use compiler_builtins mem feature instead of rlibc
Also: Update x86_64 to 0.12.2 to fix build on latest nightly.
1 parent 7be3221 commit dfa82bd

File tree

5 files changed

+11
-21
lines changed

5 files changed

+11
-21
lines changed

Cargo.lock

Lines changed: 7 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ xmas-elf = { version = "0.6.2", optional = true }
3535
x86_64 = { git = "https://github.com/rust-osdev/x86_64.git", branch = "access-level-4-table", optional = true }
3636
usize_conversions = { version = "0.2.0", optional = true }
3737
bit_field = { version = "0.10.0", optional = true }
38-
rlibc = { version = "1.0.0", optional = true }
3938
log = { version = "0.4.8", optional = true }
4039
uefi = { version = "0.6.0", optional = true }
4140
argh = { version = "0.1.3", optional = true }
@@ -62,8 +61,8 @@ toml = { version = "0.5.1", optional = true }
6261
default = []
6362
builder = ["argh", "thiserror", "displaydoc", "anyhow", "llvm-tools", "json"]
6463
runner = ["anyhow"]
65-
bios_bin = ["binary", "rlibc", "vga_320x200", "rsdp"]
66-
uefi_bin = ["binary", "rlibc", "uefi", "font8x8"]
64+
bios_bin = ["binary", "vga_320x200", "rsdp"]
65+
uefi_bin = ["binary", "uefi", "font8x8"]
6766
binary = ["llvm-tools-build", "x86_64", "toml", "xmas-elf", "usize_conversions", "log", "conquer-once", "spinning_top"]
6867
vga_320x200 = ["font8x8"]
6968
recursive_page_table = []

src/bin/bios.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#[cfg(not(target_os = "none"))]
1010
compile_error!("The bootloader crate must be compiled for the `x86_64-bootloader.json` target");
1111

12-
extern crate rlibc;
13-
1412
use bootloader::{binary::SystemInfo, boot_info::FrameBufferInfo};
1513
use core::panic::PanicInfo;
1614
use core::slice;

src/bin/builder.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ fn main() -> anyhow::Result<()> {
8181
cmd.arg("--features")
8282
.arg(args.features.join(" ") + " uefi_bin");
8383
cmd.arg("-Zbuild-std=core");
84+
cmd.arg("-Zbuild-std-features=compiler-builtins-mem");
8485
if let Some(target_dir) = &args.target_dir {
8586
cmd.arg("--target-dir").arg(target_dir);
8687
}
@@ -101,6 +102,7 @@ fn main() -> anyhow::Result<()> {
101102
cmd.arg("--features")
102103
.arg(args.features.join(" ") + " bios_bin");
103104
cmd.arg("-Zbuild-std=core");
105+
cmd.arg("-Zbuild-std-features=compiler-builtins-mem");
104106
if let Some(target_dir) = &args.target_dir {
105107
cmd.arg("--target-dir").arg(target_dir);
106108
}

src/bin/uefi.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ static KERNEL: PageAligned<[u8; KERNEL_SIZE]> = PageAligned(KERNEL_BYTES);
1515
#[repr(align(4096))]
1616
struct PageAligned<T>(T);
1717

18-
extern crate rlibc;
19-
2018
use bootloader::{
2119
binary::{legacy_memory_region::LegacyFrameAllocator, SystemInfo},
2220
boot_info::FrameBufferInfo,

0 commit comments

Comments
 (0)