Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove cargo xbuild #83

Merged
merged 10 commits into from
Jul 31, 2020
Merged

Remove cargo xbuild #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e4367b7
Add nanowait based on calibrated rdtsc
vinc Jul 14, 2020
1fc5351
Add spin_loop_hint
vinc Jul 14, 2020
c86ea7e
Update dependencies
vinc Jul 20, 2020
b134737
Update cargo config
vinc Jul 20, 2020
c5087b0
Add rlibc dependency to fix compilation bug
vinc Jul 20, 2020
c4b196f
Remove cargo xbuild
vinc Jul 20, 2020
15600d6
Merge branch 'master' into feature/remove-cargo-xbuild
vinc Jul 29, 2020
688ea20
Update crates
vinc Jul 29, 2020
a3fbdab
Merge branch 'master' into feature/remove-cargo-xbuild
vinc Jul 29, 2020
3474c9c
Update readme
vinc Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .cargo/config → .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[unstable]
build-std = ["core", "compiler_builtins", "alloc"]

[build]
target = "x86_64-moros.json"

Expand Down
19 changes: 13 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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};
Expand Down