diff options
| author | bors <bors@rust-lang.org> | 2024-10-18 17:23:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-18 17:23:35 +0000 |
| commit | f7b5e5471b79a556dfd758a25265a777fbdad7ac (patch) | |
| tree | 2ac406cb8c82ec5d3e1476c782d1d9b37d129ffa /library/std/src | |
| parent | b0c2d2e5b00339014cba0a31f634af8c146458ed (diff) | |
| parent | 43e50932f2f885281871dd91d454a3cd3571ec61 (diff) | |
| download | rust-f7b5e5471b79a556dfd758a25265a777fbdad7ac.tar.gz rust-f7b5e5471b79a556dfd758a25265a777fbdad7ac.zip | |
Auto merge of #131895 - jieyouxu:rollup-jyt3pic, r=jieyouxu
Rollup of 3 pull requests Successful merges: - #126207 (std::unix::stack_overflow::drop_handler addressing todo through libc …) - #131864 (Never emit `vptr` for empty/auto traits) - #131870 (compiletest: Store test collection context/state in two structs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/pal/unix/stack_overflow.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/library/std/src/sys/pal/unix/stack_overflow.rs b/library/std/src/sys/pal/unix/stack_overflow.rs index ac0858e1de8..69b31da427f 100644 --- a/library/std/src/sys/pal/unix/stack_overflow.rs +++ b/library/std/src/sys/pal/unix/stack_overflow.rs @@ -265,9 +265,7 @@ mod imp { /// Modern kernels on modern hardware can have dynamic signal stack sizes. #[cfg(any(target_os = "linux", target_os = "android"))] fn sigstack_size() -> usize { - // FIXME: reuse const from libc when available? - const AT_MINSIGSTKSZ: crate::ffi::c_ulong = 51; - let dynamic_sigstksz = unsafe { libc::getauxval(AT_MINSIGSTKSZ) }; + let dynamic_sigstksz = unsafe { libc::getauxval(libc::AT_MINSIGSTKSZ) }; // If getauxval couldn't find the entry, it returns 0, // so take the higher of the "constant" and auxval. // This transparently supports older kernels which don't provide AT_MINSIGSTKSZ |