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.
This commit is contained in:
Alex Crichton
2016-01-28 19:33:29 -08:00
parent 552bf75e7d
commit acaf151ade
2 changed files with 10 additions and 5 deletions
+9 -4
View File
@@ -15,7 +15,6 @@
#[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 {
PTHREAD_STACK_MIN as usize
libc::PTHREAD_STACK_MIN as usize
}
#[cfg(target_os = "netbsd")]
fn min_stack_size(_: *const libc::pthread_attr_t) -> usize {
2048 // just a guess
}