Skip to content

Commit

Permalink
Merge #36
Browse files Browse the repository at this point in the history
36: Bump `object` to `0.24.0` r=Urhengulas a=Urhengulas



Co-authored-by: Johann Hemmann <johann.hemmann@code.berlin>
  • Loading branch information
bors[bot] and Urhengulas committed May 10, 2021
2 parents 66ea82e + 46c9b78 commit 49a506e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
24 changes: 12 additions & 12 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 @@ -14,5 +14,5 @@ readme = "README.md"
anyhow = "1.0.40"
env_logger = "0.8.3"
log = "0.4.14"
object = { version = "0.23.0", default-features = false, features = ["read_core", "elf", "std"] }
object = { version = "0.24.0", default-features = false, features = ["read_core", "elf", "std"] }
tempfile = "3.2.0"
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ fn notmain() -> anyhow::Result<i32> {
.ok_or_else(|| anyhow!("MEMORY.RAM not found after scanning linker scripts"))?;

let output_path = argument_parser::get_output_path(&args)?;
let elf = fs::read(output_path)?;
let object = object::File::parse(&elf)?;
let elf = &*fs::read(output_path)?;
let object = object::File::parse(elf)?;

// TODO assert that `_stack_start == ORIGIN(RAM) + LENGTH(RAM)`
// if that's not the case the user has specified a custom location for the stack; we should
Expand Down

0 comments on commit 49a506e

Please sign in to comment.