Merge branch 'post-10' into post-11

phil-opp · Oct 2, 2020 · ca3dfc7 · ca3dfc7
2 parents bc618ad + 76282b9
commit ca3dfc7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,5 +1,6 @@
 [unstable]
 build-std = ["core", "compiler_builtins", "alloc"]
+build-std-features = ["compiler-builtins-mem"]
 
 [build]
 target = "x86_64-blog_os.json"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,6 @@ harness = false
 
 [dependencies]
 bootloader = { version = "0.9.8", features = ["map_physical_memory"]}
-rlibc = "1.0.0"
 volatile = "0.2.6"
 spin = "0.5.2"
 x86_64 = "0.12.1"

diff --git a/src/lib.rs b/src/lib.rs
@@ -9,8 +9,6 @@
 #![reexport_test_harness_main = "test_main"]
 
 extern crate alloc;
-extern crate rlibc;
-
 use core::panic::PanicInfo;
 
 pub mod allocator;