auto merge of #9301 : luqmana/rust/ncm, r=brson

Get rid of the crate_map arg!

r? @brson

3 files changed, 26 insertions, 1 deletions

diff --git a/src/test/run-pass/attr-start.rs b/src/test/run-pass/attr-start.rs
index ba54e92ef99..4c9d388dbd7 100644
--- a/src/test/run-pass/attr-start.rs
+++ b/src/test/run-pass/attr-start.rs
@@ -11,6 +11,12 @@
 //xfail-fast
 
 #[start]
+#[cfg(stage0)]
 fn start(_argc: int, _argv: **u8, _crate_map: *u8) -> int {
     return 0;
 }
+#[start]
+#[cfg(not(stage0))]
+fn start(_argc: int, _argv: **u8) -> int {
+    return 0;
+}
diff --git a/src/test/run-pass/core-rt-smoke.rs b/src/test/run-pass/core-rt-smoke.rs
index 10bd013b618..d7824a6524f 100644
--- a/src/test/run-pass/core-rt-smoke.rs
+++ b/src/test/run-pass/core-rt-smoke.rs
@@ -13,8 +13,16 @@
 // A simple test of starting the runtime manually
 
 #[start]
+#[cfg(stage0)]
 fn start(argc: int, argv: **u8, crate_map: *u8) -> int {
     do std::rt::start(argc, argv, crate_map) {
         info!("creating my own runtime is joy");
     }
 }
+#[start]
+#[cfg(not(stage0))]
+fn start(argc: int, argv: **u8) -> int {
+    do std::rt::start(argc, argv) {
+        info!("creating my own runtime is joy");
+    }
+}
diff --git a/src/test/run-pass/rt-start-main-thread.rs b/src/test/run-pass/rt-start-main-thread.rs
index 8328e7416c5..05e76137885 100644
--- a/src/test/run-pass/rt-start-main-thread.rs
+++ b/src/test/run-pass/rt-start-main-thread.rs
@@ -11,6 +11,7 @@
 // xfail-fast
 
 #[start]
+#[cfg(stage0)]
 fn start(argc: int, argv: **u8, crate_map: *u8) -> int {
     do std::rt::start_on_main_thread(argc, argv, crate_map) {
         info!("running on main thread");
@@ -18,4 +19,14 @@ fn start(argc: int, argv: **u8, crate_map: *u8) -> int {
             info!("running on another thread");
         }
     }
-}
\ No newline at end of file
+}
+#[start]
+#[cfg(not(stage0))]
+fn start(argc: int, argv: **u8) -> int {
+    do std::rt::start_on_main_thread(argc, argv) {
+        info!("running on main thread");
+        do spawn {
+            info!("running on another thread");
+        }
+    }
+}