---

yaml
---
r: 105033
b: refs/heads/snap-stage3
c: e233a43
h: refs/heads/master
i:
  105031: 27294e8
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8da5ed2026acbe655e7fac53c95623bf37e45a97
+refs/heads/snap-stage3: e233a43f5a0e14ceb322b955b16c8967adb2f4a8
 refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/dist.mk

@@ -65,8 +65,6 @@ $(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \
 dist-prepare-win: PREPARE_HOST=$(CFG_BUILD)
 dist-prepare-win: PREPARE_TARGETS=$(CFG_BUILD)
 dist-prepare-win: PREPARE_DEST_DIR=tmp/dist/win
-# On windows we're using stage3, unlike Unix...
-dist-prepare-win: PREPARE_STAGE=3
 dist-prepare-win: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
 dist-prepare-win: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
 dist-prepare-win: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
@@ -135,7 +133,6 @@ ifeq ($(CFG_OSTYPE), apple-darwin)
 dist-prepare-osx: PREPARE_HOST=$(CFG_BUILD)
 dist-prepare-osx: PREPARE_TARGETS=$(CFG_BUILD)
 dist-prepare-osx: PREPARE_DEST_DIR=tmp/dist/pkgroot
-dist-prepare-osx: PREPARE_STAGE=2
 dist-prepare-osx: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
 dist-prepare-osx: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
 dist-prepare-osx: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
@@ -165,7 +162,6 @@ dist-tar-bins: $(foreach host,$(CFG_HOST),dist/$(PKG_DIR)-$(host).tar.gz)
 define DEF_INSTALLER
 dist-install-dir-$(1): PREPARE_HOST=$(1)
 dist-install-dir-$(1): PREPARE_TARGETS=$(1)
-dist-install-dir-$(1): PREPARE_STAGE=2
 dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_DIR)-$(1)
 dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
 dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)

branches/snap-stage3/mk/install.mk

@@ -13,11 +13,10 @@
 # mirror of the installation directory structure.
 
 # The stage we install from
-ISTAGE = 2
+ISTAGE = $(PREPARE_STAGE)
 
 install: PREPARE_HOST=$(CFG_BUILD)
 install: PREPARE_TARGETS=$(CFG_TARGET)
-install: PREPARE_STAGE=$(ISTAGE)
 install: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
 install: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
 install: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)

branches/snap-stage3/mk/prepare.mk

@@ -20,7 +20,14 @@
 #   PREPARE_TARGETS - the target triples, space separated
 #   PREPARE_DEST_DIR - the directory to put the image
 
-prepare: PREPARE_STAGE=2
+
+# On windows we install from stage3, but on unix only stage2
+ifdef CFG_WINDOWSY_$(CFG_BUILD)
+PREPARE_STAGE=3
+else
+PREPARE_STAGE=2
+endif
+
 prepare: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
 prepare: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
 prepare: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
@@ -43,15 +50,6 @@ DEFAULT_PREPARE_BIN_CMD = install -m755
 DEFAULT_PREPARE_LIB_CMD = install -m644
 DEFAULT_PREPARE_MAN_CMD = install -m644
 
-# On windows we install from stage3, but on unix only stage2
-# Because of the way these rules are organized, preparing from any
-# stage requires all these stages to be built
-ifdef CFG_WINDOWSY_$(CFG_BUILD)
-PREPARE_STAGES=3
-else
-PREPARE_STAGES=2
-endif
-
 # Create a directory
 # $(1) is the directory
 define PREPARE_DIR
@@ -102,9 +100,8 @@ prepare-host: prepare-host-tools
 
 prepare-host-tools: \
         $(foreach tool, $(PREPARE_TOOLS),\
-          $(foreach stage,$(PREPARE_STAGES),\
-            $(foreach host,$(CFG_HOST),\
-              prepare-host-tool-$(tool)-$(stage)-$(host))))
+          $(foreach host,$(CFG_HOST),\
+            prepare-host-tool-$(tool)-$(PREPARE_STAGE)-$(host)))
 
 prepare-host-dirs: prepare-maybe-clean
 	$(call PREPARE_DIR,$(PREPARE_DEST_BIN_DIR))
@@ -128,9 +125,8 @@ prepare-host-tool-$(1)-$(2)-$(3): prepare-maybe-clean \
 endef
 
 $(foreach tool,$(PREPARE_TOOLS),\
-  $(foreach stage,$(PREPARE_STAGES),\
-    $(foreach host,$(CFG_HOST),\
-        $(eval $(call DEF_PREPARE_HOST_TOOL,$(tool),$(stage),$(host))))))
+  $(foreach host,$(CFG_HOST),\
+      $(eval $(call DEF_PREPARE_HOST_TOOL,$(tool),$(PREPARE_STAGE),$(host)))))
 
 # For host libraries only install dylibs, not rlibs since the host libs are only
 # used to support rustc and rustc uses dynamic linking
@@ -151,15 +147,13 @@ prepare-host-lib-$(1)-$(2)-$(3): prepare-maybe-clean \
 endef
 
 $(foreach lib,$(CRATES),\
-  $(foreach stage,$(PREPARE_STAGES),\
-    $(foreach host,$(CFG_HOST),\
-      $(eval $(call DEF_PREPARE_HOST_LIB,$(lib),$(stage),$(host))))))
+  $(foreach host,$(CFG_HOST),\
+    $(eval $(call DEF_PREPARE_HOST_LIB,$(lib),$(PREPARE_STAGE),$(host)))))
 
 prepare-targets:\
         $(foreach host,$(CFG_HOST),\
            $(foreach target,$(CFG_TARGET),\
-             $(foreach stage,$(PREPARE_STAGES),\
-               prepare-target-$(target)-host-$(host)-$(stage))))
+             prepare-target-$(target)-host-$(host)-$(PREPARE_STAGE)))
 
 # $(1) is stage
 # $(2) is target
@@ -194,8 +188,7 @@ endef
 
 $(foreach host,$(CFG_HOST),\
   $(foreach target,$(CFG_TARGET), \
-    $(foreach stage,$(PREPARE_STAGES),\
-      $(eval $(call DEF_PREPARE_TARGET_N,$(stage),$(target),$(host))))))
+    $(eval $(call DEF_PREPARE_TARGET_N,$(PREPARE_STAGE),$(target),$(host)))))
 
 prepare-maybe-clean:
 	$(if $(findstring true,$(PREPARE_CLEAN)),\

branches/snap-stage3/src/compiletest/compiletest.rs

@@ -19,6 +19,8 @@ extern crate test;
 extern crate getopts;
 #[phase(link, syntax)]
 extern crate log;
+extern crate green;
+extern crate rustuv;
 
 use std::os;
 use std::io;
@@ -41,6 +43,9 @@ pub mod runtest;
 pub mod common;
 pub mod errors;
 
+#[start]
+fn start(argc: int, argv: **u8) -> int { green::start(argc, argv, main) }
+
 pub fn main() {
     let args = os::args();
     let config = parse_config(args.move_iter().collect());

branches/snap-stage3/src/driver/driver.rs

@@ -8,15 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[no_uv];
+#[no_uv]; // remove this after stage0
+#[allow(attribute_usage)]; // remove this after stage0
+extern crate native; // remove this after stage0
 
 #[cfg(rustdoc)]
 extern crate this = "rustdoc";
 
 #[cfg(rustc)]
 extern crate this = "rustc";
 
-extern crate native;
+#[cfg(not(stage0))]
+fn main() { this::main() }
 
+#[cfg(stage0)]
 #[start]
 fn start(argc: int, argv: **u8) -> int { native::start(argc, argv, this::main) }

branches/snap-stage3/src/libgreen/lib.rs

@@ -209,7 +209,7 @@ pub mod stack;
 pub mod task;
 
 #[lang = "start"]
-#[cfg(not(test))]
+#[cfg(not(test), stage0)]
 pub fn lang_start(main: *u8, argc: int, argv: **u8) -> int {
     use std::cast;
     start(argc, argv, proc() {

branches/snap-stage3/src/libnative/lib.rs

@@ -58,6 +58,7 @@
 
 use std::os;
 use std::rt;
+use std::str;
 
 pub mod io;
 pub mod task;
@@ -68,6 +69,16 @@ static OS_DEFAULT_STACK_ESTIMATE: uint = 1 << 20;
 #[cfg(unix, not(android))]
 static OS_DEFAULT_STACK_ESTIMATE: uint = 2 * (1 << 20);
 
+#[lang = "start"]
+#[cfg(not(test), not(stage0))]
+pub fn lang_start(main: *u8, argc: int, argv: **u8) -> int {
+    use std::cast;
+    start(argc, argv, proc() {
+        let main: extern "Rust" fn() = unsafe { cast::transmute(main) };
+        main();
+    })
+}
+
 /// Executes the given procedure after initializing the runtime with the given
 /// argc/argv.
 ///
@@ -90,7 +101,12 @@ pub fn start(argc: int, argv: **u8, main: proc()) -> int {
     rt::init(argc, argv);
     let mut exit_code = None;
     let mut main = Some(main);
-    let t = task::new((my_stack_bottom, my_stack_top)).run(|| {
+    let mut task = task::new((my_stack_bottom, my_stack_top));
+    task.name = Some(str::Slice("<main>"));
+    let t = task.run(|| {
+        unsafe {
+            rt::stack::record_stack_bounds(my_stack_bottom, my_stack_top);
+        }
         exit_code = Some(run(main.take_unwrap()));
     });
     drop(t);