Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 63a4a9b

Browse files
committedOct 18, 2024
Auto merge of rust-lang#131895 - jieyouxu:rollup-jyt3pic, r=jieyouxu
Rollup of 3 pull requests Successful merges: - rust-lang#126207 (std::unix::stack_overflow::drop_handler addressing todo through libc …) - rust-lang#131864 (Never emit `vptr` for empty/auto traits) - rust-lang#131870 (compiletest: Store test collection context/state in two structs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e08bce6 + 39ccfc9 commit 63a4a9b

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed
 

‎std/src/sys/pal/unix/stack_overflow.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,7 @@ mod imp {
265265
/// Modern kernels on modern hardware can have dynamic signal stack sizes.
266266
#[cfg(any(target_os = "linux", target_os = "android"))]
267267
fn sigstack_size() -> usize {
268-
// FIXME: reuse const from libc when available?
269-
const AT_MINSIGSTKSZ: crate::ffi::c_ulong = 51;
270-
let dynamic_sigstksz = unsafe { libc::getauxval(AT_MINSIGSTKSZ) };
268+
let dynamic_sigstksz = unsafe { libc::getauxval(libc::AT_MINSIGSTKSZ) };
271269
// If getauxval couldn't find the entry, it returns 0,
272270
// so take the higher of the "constant" and auxval.
273271
// This transparently supports older kernels which don't provide AT_MINSIGSTKSZ

0 commit comments

Comments
 (0)
Please sign in to comment.