diff --git a/.cargo/config b/.cargo/config.toml similarity index 61% rename from .cargo/config rename to .cargo/config.toml index 82ee2a44..10eb1be7 100644 --- a/.cargo/config +++ b/.cargo/config.toml @@ -1,3 +1,6 @@ +[unstable] +build-std = ["core", "compiler_builtins", "alloc"] + [build] target = "x86_64-moros.json" diff --git a/Cargo.lock b/Cargo.lock index cf746cb9..485aef7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "bootloader" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7239572eacd7c74ac0d6c75eb87a615058d6497a667728694e0d32b7bd5a20" +checksum = "0ad686b9b47363de7d36c05fb6885f17d08d0f2d15b1bc782a101fe3c94a2c7c" [[package]] name = "byte-tools" @@ -179,6 +179,7 @@ dependencies = [ "pc-keyboard", "pic8259_simple", "raw-cpuid", + "rlibc", "sha2", "smoltcp", "spin", @@ -221,9 +222,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" dependencies = [ "unicode-xid", ] @@ -248,6 +249,12 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "rlibc" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe" + [[package]] name = "rustc_version" version = "0.2.3" @@ -352,9 +359,9 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" [[package]] name = "volatile" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29" +checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945" [[package]] name = "vte" diff --git a/Cargo.toml b/Cargo.toml index 4a383857..8e11d463 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,3 +34,4 @@ uart_16550 = "0.2.7" volatile = "0.2.6" x86_64 = "0.11.1" vte = "0.8.0" +rlibc = "1.0.0" diff --git a/Makefile b/Makefile index 39d4b3ca..6c53b353 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ setup: rustup default nightly rustup component add rust-src rustup component add llvm-tools-preview - cargo install cargo-xbuild bootimage + cargo install bootimage output = vga keyboard = qwerty diff --git a/README.md b/README.md index ee7da904..0298e4ba 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,12 @@ Install tools: $ rustup default nightly $ rustup component add rust-src $ rustup component add llvm-tools-preview - $ cargo install cargo-xbuild bootimage + $ cargo install bootimage + +Clone repo: + + $ git clone https://github.com/vinc/moros + $ cd moros ## Usage diff --git a/src/main.rs b/src/main.rs index 01a3c47e..2005948b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,7 @@ #![no_std] #![no_main] +extern crate rlibc; // TODO: See https://github.com/rust-lang/wg-cargo-std-aware/issues/53 extern crate alloc; use bootloader::{entry_point, BootInfo};