Skip to content

Commit 76282b9

Browse files
committed
Merge branch 'post-09' into post-10
2 parents c1133b0 + 93844be commit 76282b9

File tree

4 files changed

+1
-10
lines changed

4 files changed

+1
-10
lines changed

.cargo/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[unstable]
22
build-std = ["core", "compiler_builtins", "alloc"]
3+
build-std-features = ["compiler-builtins-mem"]
34

45
[build]
56
target = "x86_64-blog_os.json"

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ harness = false
1414

1515
[dependencies]
1616
bootloader = { version = "0.9.8", features = ["map_physical_memory"]}
17-
rlibc = "1.0.0"
1817
volatile = "0.2.6"
1918
spin = "0.5.2"
2019
x86_64 = "0.12.1"

src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#![reexport_test_harness_main = "test_main"]
88

99
extern crate alloc;
10-
extern crate rlibc;
11-
1210
use core::panic::PanicInfo;
1311

1412
pub mod allocator;

0 commit comments

Comments
 (0)