diff options
| author | bors <bors@rust-lang.org> | 2020-06-25 12:43:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-25 12:43:50 +0000 |
| commit | 9f3c96b869b48ecd0bb556c6ad9cd603b4dacfb9 (patch) | |
| tree | 2db86ae6273e5e966c66f2891ca26cf89b8f6e11 /src/libstd/sys | |
| parent | 229e5b2640fc5715e77607a989748be588d983f2 (diff) | |
| parent | 8d1934ec8d3ae75c19afe9b1de4373801d383a9f (diff) | |
| download | rust-9f3c96b869b48ecd0bb556c6ad9cd603b4dacfb9.tar.gz rust-9f3c96b869b48ecd0bb556c6ad9cd603b4dacfb9.zip | |
Auto merge of #73711 - Dylan-DPC:rollup-kzx15of, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #72700 (`improper_ctypes_definitions` lint) - #73516 (Allow dynamic linking for iOS/tvOS targets) - #73616 (Liballoc minor hash import tweak) - #73634 (Add UI test for issue 73592) - #73688 (Document the self keyword) - #73698 (Add procedure for prioritization notifications on Zulip) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/sgx/abi/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/sys/sgx/abi/mod.rs b/src/libstd/sys/sgx/abi/mod.rs index 87e7a5da2b7..5ef26d4cc4d 100644 --- a/src/libstd/sys/sgx/abi/mod.rs +++ b/src/libstd/sys/sgx/abi/mod.rs @@ -56,6 +56,7 @@ unsafe extern "C" fn tcs_init(secondary: bool) { // able to specify this #[cfg(not(test))] #[no_mangle] +#[allow(improper_ctypes_definitions)] extern "C" fn entry(p1: u64, p2: u64, p3: u64, secondary: bool, p4: u64, p5: u64) -> (u64, u64) { // FIXME: how to support TLS in library mode? let tls = Box::new(tls::Tls::new()); |