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

Conflicts: src/rt/rust_builtin.cpp src/rt/rustrt.def.in
2013-06-20 12:17:00 -07:00
parent adeb7e77cc 4d39253a96
commit 357f087786
30 changed files with 3148 additions and 837 deletions
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -925,6 +925,13 @@ 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++