diff options
| author | Jethro Beekman <jethro@fortanix.com> | 2018-08-27 21:33:26 -0700 |
|---|---|---|
| committer | Jethro Beekman <jethro@fortanix.com> | 2018-12-07 11:26:50 +0530 |
| commit | 4a3505682e97c8e667338056ae216e4b84b22dd7 (patch) | |
| tree | 64f04641da2097afb5c6a386f8e26a36a2687e6e /src/libpanic_abort | |
| parent | c559216ad0d2f0737f8dbb51a7d42b1727b77b3c (diff) | |
Add x86_64-fortanix-unknown-sgx target to libstd and dependencies
The files src/libstd/sys/sgx/*.rs are mostly copied/adapted from the wasm target. This also updates the dlmalloc submodule to the very latest version.
Diffstat (limited to 'src/libpanic_abort')
| -rw-r--r-- | src/libpanic_abort/lib.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libpanic_abort/lib.rs b/src/libpanic_abort/lib.rs index 9235f8e7660..95c3514185e 100644 --- a/src/libpanic_abort/lib.rs +++ b/src/libpanic_abort/lib.rs @@ -66,6 +66,12 @@ pub unsafe extern fn __rust_start_panic(_payload: usize) -> u32 { unsafe fn abort() -> ! { core::intrinsics::abort(); } + + #[cfg(target_env="sgx")] + unsafe fn abort() -> ! { + extern "C" { pub fn panic_exit() -> !; } + panic_exit(); + } } // This... is a bit of an oddity. The tl;dr; is that this is required to link |
