Skip to content

Commit 2918556

Browse files
committed
Upgrade the fortanix-sgx-abi dependency
0.6.1 removes the `compiler-builtins` dependency, part of RUST-142265. The breaking change from 0.5 to 0.6 is for an update to the `insecure_time` API [1]. I validated that `./x c library --target x86_64-fortanix-unknown-sgx` completes successfully with this change. Link: fortanix/rust-sgx@a34e976 [1]
1 parent 6988a8f commit 2918556

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

library/Cargo.lock

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,10 @@ dependencies = [
9090

9191
[[package]]
9292
name = "fortanix-sgx-abi"
93-
version = "0.5.0"
93+
version = "0.6.1"
9494
source = "registry+https://github.com/rust-lang/crates.io-index"
95-
checksum = "57cafc2274c10fab234f176b25903ce17e690fca7597090d50880e047a0389c5"
95+
checksum = "5efc85edd5b83e8394f4371dd0da6859dff63dd387dab8568fece6af4cde6f84"
9696
dependencies = [
97-
"compiler_builtins",
9897
"rustc-std-workspace-core",
9998
]
10099

library/std/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ rand_xorshift = "0.4.0"
6868
dlmalloc = { version = "0.2.4", features = ['rustc-dep-of-std'] }
6969

7070
[target.x86_64-fortanix-unknown-sgx.dependencies]
71-
fortanix-sgx-abi = { version = "0.5.0", features = [
71+
fortanix-sgx-abi = { version = "0.6.1", features = [
7272
'rustc-dep-of-std',
7373
], public = true }
7474

library/std/src/sys/pal/sgx/abi/usercalls/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ pub fn send(event_set: u64, tcs: Option<Tcs>) -> IoResult<()> {
267267
/// Usercall `insecure_time`. See the ABI documentation for more information.
268268
#[unstable(feature = "sgx_platform", issue = "56975")]
269269
pub fn insecure_time() -> Duration {
270-
let t = unsafe { raw::insecure_time() };
270+
let t = unsafe { raw::insecure_time().0 };
271271
Duration::new(t / 1_000_000_000, (t % 1_000_000_000) as _)
272272
}
273273

0 commit comments

Comments
 (0)