Skip to content

Commit

Permalink
switch to the latest rust tool chain
Browse files Browse the repository at this point in the history
- remove the usage of the crate x86_64
  • Loading branch information
stlankes committed Sep 10, 2024
1 parent a46f20b commit 032910c
Show file tree
Hide file tree
Showing 15 changed files with 138 additions and 229 deletions.
213 changes: 110 additions & 103 deletions Cargo.lock

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

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ run-command = ["qemu-system-x86_64", "-display", "none", "-smp", "1", "-m", "256
run-args = []

[dependencies]
hermit-sync = "0.1.6"
qemu-exit = "3.0" # Spinlocks.
spinning_top = "0.3.0"

[target.'cfg(target_arch = "aarch64")'.dependencies]
semihosting = "0.1.9"

[target.'cfg(target_arch = "x86_64")'.dependencies]
bootloader = "0.9.29"
x86 = { version = "0.52", default-features = false }
x86_64 = "0.15"

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = { version = "0.2.92" }
web-sys = { version = "0.3.4", features = ['Document','Element','HtmlElement','Node','Window',] }
16 changes: 0 additions & 16 deletions aarch64-eduos.json

This file was deleted.

2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2023-03-10"
channel = "nightly-2024-09-01"
components = [
"clippy",
"rustfmt",
Expand Down
3 changes: 0 additions & 3 deletions src/arch/aarch64/mod.rs

This file was deleted.

4 changes: 0 additions & 4 deletions src/arch/aarch64/processor.rs

This file was deleted.

Loading

0 comments on commit 032910c

Please sign in to comment.