Skip to content

Commit

Permalink
Merge branch 'main' into alloc
Browse files Browse the repository at this point in the history
  • Loading branch information
duanyu-yu authored Jan 9, 2024
2 parents 0a84021 + 936f871 commit 38ea9bd
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 10 deletions.
34 changes: 25 additions & 9 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ x86_64 = { version = "0.14", default-features = false, features = ["instructions
[target.'cfg(target_arch = "aarch64")'.dependencies]
align-data = "0.1"
hermit-dtb = { version = "0.1" }
goblin = { version = "0.7", default-features = false, features = ["elf64"] }
goblin = { version = "0.8", default-features = false, features = ["elf64"] }

[target.'cfg(target_os = "uefi")'.dependencies]
uefi = "0.26"
Expand Down

0 comments on commit 38ea9bd

Please sign in to comment.