michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-11' into post-12

Browse Source
This commit is contained in:
Philipp Oppermann
2020-10-02 23:38:32 +02:00
parent 124a95b2d3 ca3dfc719c
commit d5f674e62e
4 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.cargo/config.toml
View File

@@ -1,5 +1,6 @@
[unstable] [unstable]
build-std = ["core", "compiler_builtins", "alloc"] build-std = ["core", "compiler_builtins", "alloc"]
build-std-features = ["compiler-builtins-mem"]
[build] [build]
target = "x86_64-blog_os.json" target = "x86_64-blog_os.json"

7
Cargo.lock generated
View File

@@ -30,7 +30,6 @@ dependencies = [
"linked_list_allocator", "linked_list_allocator",
"pc-keyboard", "pc-keyboard",
"pic8259_simple", "pic8259_simple",
"rlibc",
"spin", "spin",
"uart_16550", "uart_16550",
"volatile", "volatile",
@@ -207,12 +206,6 @@ dependencies = [
"proc-macro2", "proc-macro2",
] ]
[[package]]
name = "rlibc"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
[[package]] [[package]]
name = "scopeguard" name = "scopeguard"
version = "1.1.0" version = "1.1.0"

1
Cargo.toml
View File

@@ -14,7 +14,6 @@ harness = false
[dependencies] [dependencies]
bootloader = { version = "0.9.8", features = ["map_physical_memory"]} bootloader = { version = "0.9.8", features = ["map_physical_memory"]}
rlibc = "1.0.0"
volatile = "0.2.6" volatile = "0.2.6"
spin = "0.5.2" spin = "0.5.2"
x86_64 = "0.12.1" x86_64 = "0.12.1"

2
src/lib.rs
View File

@@ -10,8 +10,6 @@
#![reexport_test_harness_main = "test_main"] #![reexport_test_harness_main = "test_main"]
extern crate alloc; extern crate alloc;
extern crate rlibc;
use core::panic::PanicInfo; use core::panic::PanicInfo;
pub mod allocator; pub mod allocator;