Skip to content

Commit

Permalink
fix(sgx): do not use rbx register in asm!()
Browse files Browse the repository at this point in the history
error: invalid register rbx: rbx is used internally by LLVM and
cannot be used as an operand for inline asm

So, we pull in a newer `sgx` crate version, which has this fixed.

See:
rust-lang/rust#84658 (comment)

and:
https://github.com/rust-lang/rust/pull/84658/files#diff-d7283132d97a993fad4e2d491ac883dbce4e17fe248cdf37fa3f9334e2a5a115

Signed-off-by: Harald Hoyer <harald@redhat.com>
  • Loading branch information
haraldh committed Jul 1, 2021
1 parent 683c6a5 commit 7ee06b6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion internal/shim-sgx/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 internal/shim-sgx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sgx-heap = { path = "../sgx-heap" }
sallyport = { git = "https://github.com/enarx/sallyport", rev = "efccf0f" }
rcrt1 = { git = "https://github.com/enarx/rcrt1", rev = "2205dc7" }
compiler_builtins = { version = "0.1", default-features = false, features = [ "mem" ] }
sgx = { git = "https://github.com/enarx/sgx", rev = "5292e53", features = [ "asm" ] }
sgx = { git = "https://github.com/enarx/sgx", rev = "4bb50e55bc8717c5bc2a98d680bf1be436cda8de", features = [ "asm" ] }
goblin = { version = "0.3", default-features = false, features = [ "elf64" ] }
crt0stack = { version = "0.1", default-features = false }
libc = { version = "0.2", default-features = false }
Expand Down

0 comments on commit 7ee06b6

Please sign in to comment.