mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #87528 - :stack_overflow_obsd, r=joshtriplett

Browse Source 
stack overflow handler specific openbsd change.
This commit is contained in:
Guillaume Gomez 2021-10-09 17:08:38 +02:00 committed by GitHub
commit 3e4f95612e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/std/src/sys/unix/stack_overflow.rs
View File

@ -143,14 +143,15 @@ pub unsafe fn cleanup() {
} }
unsafe fn get_stackp() -> *mut libc::c_void { unsafe fn get_stackp() -> *mut libc::c_void {
let stackp = mmap( // OpenBSD requires this flag for stack mapping
ptr::null_mut(), // otherwise the said mapping will fail as a no-op on most systems
SIGSTKSZ + page_size(), // and has a different meaning on FreeBSD
PROT_READ | PROT_WRITE, #[cfg(any(target_os = "openbsd", target_os = "netbsd", target_os = "linux",))]
MAP_PRIVATE | MAP_ANON, let flags = MAP_PRIVATE | MAP_ANON | libc::MAP_STACK;
-1, #[cfg(not(any(target_os = "openbsd", target_os = "netbsd", target_os = "linux",)))]
0, let flags = MAP_PRIVATE | MAP_ANON;
); let stackp =
mmap(ptr::null_mut(), SIGSTKSZ + page_size(), PROT_READ | PROT_WRITE, flags, -1, 0);
if stackp == MAP_FAILED { if stackp == MAP_FAILED {
panic!("failed to allocate an alternative stack: {}", io::Error::last_os_error()); panic!("failed to allocate an alternative stack: {}", io::Error::last_os_error());
} }