From acaf151ade7befa92eee8a9e0c3d03695194292b Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 28 Jan 2016 19:33:29 -0800 Subject: std: Fix rumprun build Looks like the rumprun build has bitrotted over time, so this includes some libc fixes and some various libstd fixes which gets it back to bootstrapping. --- src/libstd/sys/unix/thread.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/libstd/sys') diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 9e28cf06d61..0faa1465c32 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -15,7 +15,6 @@ use cmp; #[cfg(not(target_env = "newlib"))] use ffi::CString; use io; -use libc::PTHREAD_STACK_MIN; use libc; use mem; use ptr; @@ -339,14 +338,20 @@ fn min_stack_size(attr: *const libc::pthread_attr_t) -> usize { }); match unsafe { __pthread_get_minstack } { - None => PTHREAD_STACK_MIN as usize, + None => libc::PTHREAD_STACK_MIN as usize, Some(f) => unsafe { f(attr) as usize }, } } // No point in looking up __pthread_get_minstack() on non-glibc // platforms. -#[cfg(not(target_os = "linux"))] +#[cfg(all(not(target_os = "linux"), + not(target_os = "netbsd")))] +fn min_stack_size(_: *const libc::pthread_attr_t) -> usize { + libc::PTHREAD_STACK_MIN as usize +} + +#[cfg(target_os = "netbsd")] fn min_stack_size(_: *const libc::pthread_attr_t) -> usize { - PTHREAD_STACK_MIN as usize + 2048 // just a guess } -- cgit 1.4.1-3-g733a5