Rollup merge of rust-lang#95505 - sunfishcode:sunfishcode/fix-openbsd, r=dtolnay

Dylan-DPC · web-flow · commit 0b71ca84b0e6 · 2022-03-31T13:09:55.000+02:00
Fix library/std compilation on openbsd. Fix a minor typo from rust-lang#95241 which prevented compilation on x86_64-unknown-openbsd.
diff --git a/library/std/src/sys/unix/thread.rs b/library/std/src/sys/unix/thread.rs
@@ -522,7 +522,7 @@ pub mod guard {
             // new thread
             stack_ptr.addr() - current_stack.ss_size
         };
-        Some(stack_ptr.with_addr(stack_addr))
+        Some(stack_ptr.with_addr(stackaddr))
     }
 
     #[cfg(any(

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ pub mod guard {`
`522`	`522`	`// new thread`
`523`	`523`	`stack_ptr.addr() - current_stack.ss_size`
`524`	`524`	`};`
`525`		`- Some(stack_ptr.with_addr(stack_addr))`
	`525`	`+ Some(stack_ptr.with_addr(stackaddr))`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`#[cfg(any(`