diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-02-23 09:25:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-23 09:25:24 +0100 |
| commit | 4f99061874f60fa04eb6868ddd70cfea25995fec (patch) | |
| tree | b73eed7461069cb4ea67d8bddee280aa810900c4 /src/libstd | |
| parent | 368864329356e3ef8c6aa495b35d55779ae90eaa (diff) | |
| parent | 347a42e38770593cb82affc6d3d7413ebae911f0 (diff) | |
| download | rust-4f99061874f60fa04eb6868ddd70cfea25995fec.tar.gz rust-4f99061874f60fa04eb6868ddd70cfea25995fec.zip | |
Rollup merge of #58453 - jethrogb:jb/sgx-panic-abort, r=nagisa
SGX target: fix panic = abort What is the difference between `no_mangle` and `rustc_std_internal_symbol`?
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/sgx/rwlock.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/sys/sgx/rwlock.rs b/src/libstd/sys/sgx/rwlock.rs index 33163a556c1..4dfbe86d14f 100644 --- a/src/libstd/sys/sgx/rwlock.rs +++ b/src/libstd/sys/sgx/rwlock.rs @@ -204,6 +204,7 @@ pub unsafe extern "C" fn __rust_print_err(m: *mut u8, s: i32) { } #[no_mangle] +// NB. used by both libunwind and libpanic_abort pub unsafe extern "C" fn __rust_abort() { ::sys::abort_internal(); } |