diff options
| author | bors <bors@rust-lang.org> | 2021-08-29 15:18:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-29 15:18:58 +0000 |
| commit | daa4dc997c777676b0f0e48d0311cc5e7bde5f87 (patch) | |
| tree | cebe9c4ba461a25af6002923570c0d0a34ab155f /library/std/src/sys/unix/stack_overflow.rs | |
| parent | ef524710669a003cf2b24361dc6b04b566e560fa (diff) | |
| parent | 26feefddc7f6834658ee9ff4671a7b99a040e60b (diff) | |
| download | rust-daa4dc997c777676b0f0e48d0311cc5e7bde5f87.tar.gz rust-daa4dc997c777676b0f0e48d0311cc5e7bde5f87.zip | |
Auto merge of #88461 - GuillaumeGomez:rollup-khgu0eb, r=GuillaumeGomez
Rollup of 13 pull requests Successful merges: - #80543 (Notify when an `I-prioritize` issue is closed or reopened) - #83251 (Suggestion for call on immutable binding of mutable type) - #85534 (add rustc-demangle assertion on mangled symbol) - #88173 (Refactor Markdown length-limited summary implementation) - #88349 (Add const and static TAIT tests) - #88357 (add unsized coercion test) - #88381 (Handle stack_t.ss_sp type change for DragonFlyBSD) - #88387 (Remove vestigial rustfix tests.) - #88396 (Bump vulnerable crates) - #88407 (Fix formatting in release notes from 52a988344bce11) - #88411 (Remove `Session.if_let_suggestions`) - #88417 (RELEASES.md: fix broken link) - #88419 (Fix code blocks color in Ayu theme) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/unix/stack_overflow.rs')
| -rw-r--r-- | library/std/src/sys/unix/stack_overflow.rs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/library/std/src/sys/unix/stack_overflow.rs b/library/std/src/sys/unix/stack_overflow.rs index 81f47a779d3..e8747e39bcb 100644 --- a/library/std/src/sys/unix/stack_overflow.rs +++ b/library/std/src/sys/unix/stack_overflow.rs @@ -161,24 +161,10 @@ mod imp { stackp.add(page_size()) } - #[cfg(any( - target_os = "linux", - target_os = "macos", - target_os = "freebsd", - target_os = "netbsd", - target_os = "openbsd", - target_os = "solaris", - target_os = "illumos" - ))] unsafe fn get_stack() -> libc::stack_t { libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ } } - #[cfg(target_os = "dragonfly")] - unsafe fn get_stack() -> libc::stack_t { - libc::stack_t { ss_sp: get_stackp() as *mut i8, ss_flags: 0, ss_size: SIGSTKSZ } - } - pub unsafe fn make_handler() -> Handler { if !NEED_ALTSTACK.load(Ordering::Relaxed) { return Handler::null(); |
