diff options
| author | bors <bors@rust-lang.org> | 2019-02-13 07:46:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-13 07:46:21 +0000 |
| commit | ccd23b95e5077a89a2ce35d09cbd4141ccc94f58 (patch) | |
| tree | 081854c6d2d08c3e816a5661f73129cb53be960a /src/libstd/lib.rs | |
| parent | 827a141466e7bb85eb3c030600878a2c606019e9 (diff) | |
| parent | 0d2ab0b77dd82d192f987ab4e1645577eccd3562 (diff) | |
| download | rust-ccd23b95e5077a89a2ce35d09cbd4141ccc94f58.tar.gz rust-ccd23b95e5077a89a2ce35d09cbd4141ccc94f58.zip | |
Auto merge of #58235 - jethrogb:jb/sgx-usercall-internals, r=alexcrichton
SGX target: simplify usercall internals This moves logic from assembly to Rust and removes the special case for exit/panic handling, merging it with regular usercall handling. Also, this fixes a bug in the exit usercall introduced in a75ae00. The bug would make regular exits look like panics with high probability. It would also with some probability leak information through uncleared registers. cc @VardhanThigle r? @alexcrichton
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 63cf6b62145..e57cb2ce5fd 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -341,9 +341,6 @@ extern crate backtrace_sys; #[cfg(test)] extern crate std as realstd; #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))] -#[macro_use] -#[allow(unused_imports)] // FIXME: without `#[macro_use]`, get error: “cannot - // determine resolution for the macro `usercalls_asm`” extern crate fortanix_sgx_abi; // The standard macros that are not built-in to the compiler. |