Merge remote-tracking branch 'brson/io' into io-upstream

Conflicts:
	src/rt/rust_builtin.cpp
	src/rt/rustrt.def.in

diff --cc src/libstd/sys.rs
Simple merge

diff --cc src/libstd/task/spawn.rs
Simple merge

diff --cc src/libstd/unstable/lang.rs
Simple merge

diff --cc src/libstd/unstable/sync.rs
Simple merge

diff --cc src/rt/rust_builtin.cpp
index e476fa0ad5e07aa9308be4e46c28102edd92df49,fe4e75fb8d21f8269fef21c06a7019c9778e5b66..8e494cb577b55274835755d5f619ebe34b1fa6b9
--- 1/src/rt/rust_builtin.cpp
--- 2/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@@ -920,11 -930,13 +920,18 @@@ rust_begin_unwind(uintptr_t token) 
  #endif
  }
  
 +extern "C" CDECL uintptr_t
 +rust_running_on_valgrind() {
 +    return RUNNING_ON_VALGRIND;
 +}
 +
+ extern int get_num_cpus();
+ 
+ extern "C" CDECL uintptr_t
+ rust_get_num_cpus() {
+     return get_num_cpus();
+ }
+ 
  //
  // Local Variables:
  // mode: C++

diff --cc src/rt/rustrt.def.in
index ba7ada04a2754fe78fd5f388432fc3b3644dec3b,c93d29f6148c6f1cebc5efc25429545ccb53b125..425f17d4290073ba37919f835afe8ff4684a6a92
--- 1/src/rt/rustrt.def.in
--- 2/src/rt/rustrt.def.in
+++ b/src/rt/rustrt.def.in
@@@ -239,4 -240,4 +240,5 @@@ rust_valgrind_stack_deregiste
  rust_take_env_lock
  rust_drop_env_lock
  rust_update_log_settings
- rust_running_on_valgrind
 -rust_get_num_cpus
++rust_running_on_valgrind
++rust_get_num_cpus