auto merge of #10855 : alexcrichton/rust/snapshots, r=pcwalton

This transitions the snapshot dependency process to understand that our
snapshots are now a single static binary rather than an array of files.

4 files changed, 12 insertions, 76 deletions

diff --git a/Makefile.in b/Makefile.in
index 5348499a19f..86d0e453b10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -431,6 +431,9 @@ TLIBRUSTUV_DEFAULT$(1)_T_$(2)_H_$(3) = \
   $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
 
 # Preqrequisites for using the stageN compiler
+ifeq ($(1),0)
+HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
+else
 HSREQ$(1)_H_$(3) = \
 	$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
 	$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
@@ -439,6 +442,7 @@ HSREQ$(1)_H_$(3) = \
 	$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
 	$$(HLIBRUSTUV_DEFAULT$(1)_H_$(3)) \
 	$$(MKFILE_DEPS)
+endif
 
 # Prerequisites for using the stageN compiler to build target artifacts
 TSREQ$(1)_T_$(2)_H_$(3) = \
diff --git a/mk/stage0.mk b/mk/stage0.mk
index bf55289a7fb..ddc9ec5ac78 100644
--- a/mk/stage0.mk
+++ b/mk/stage0.mk
@@ -25,34 +25,6 @@ endif
 endif
 	$(Q)touch $@
 
-# Host libs will be extracted by the above rule
-
-# NOTE: remove all these after the next snapshot
-$(HLIB0_H_$(CFG_BUILD))/$(CFG_STDLIB_$(CFG_BUILD)): \
-		$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
-		| $(HLIB0_H_$(CFG_BUILD))/
-	$(Q)touch $@
-
-$(HLIB0_H_$(CFG_BUILD))/$(CFG_EXTRALIB_$(CFG_BUILD)): \
-		$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
-		| $(HLIB0_H_$(CFG_BUILD))/
-	$(Q)touch $@
-
-$(HLIB0_H_$(CFG_BUILD))/$(CFG_LIBRUSTUV_$(CFG_BUILD)): \
-		$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
-		| $(HLIB0_H_$(CFG_BUILD))/
-	$(Q)touch $@
-
-$(HLIB0_H_$(CFG_BUILD))/$(CFG_LIBRUSTC_$(CFG_BUILD)): \
-		$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
-		| $(HLIB0_H_$(CFG_BUILD))/
-	$(Q)touch $@
-
-$(HLIB0_H_$(CFG_BUILD))/$(CFG_RUSTLLVM_$(CFG_BUILD)): \
-		$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
-		| $(HLIB0_H_$(CFG_BUILD))/
-	$(Q)touch $@
-
 # For other targets, let the host build the target:
 
 define BOOTSTRAP_STAGE0
@@ -72,45 +44,6 @@ $$(HBIN0_H_$(1))/rustc$$(X_$(1)): \
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
 
-# NOTE: removing everything below after the next snapshot
-$$(HLIB0_H_$(1))/$(CFG_STDLIB_$(1)): \
-		$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_STDLIB_$(1)) \
-		| $(HLIB0_H_$(1))/
-	@$$(call E, cp: $$@)
-	$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
-	$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(STDLIB_GLOB_$(1)) $$@
-	$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
-
-$$(HLIB0_H_$(1))/$(CFG_EXTRALIB_$(1)): \
-		$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_EXTRALIB_$(1)) \
-		| $(HLIB0_H_$(1))/
-	@$$(call E, cp: $$@)
-	$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
-	$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(EXTRALIB_GLOB_$(1)) $$@
-	$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
-
-$$(HLIB0_H_$(1))/$(CFG_LIBRUSTUV_$(1)): \
-		$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_LIBRUSTUV_$(1)) \
-		| $(HLIB0_H_$(1))/
-	@$$(call E, cp: $$@)
-	$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
-	$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(LIBRUSTUV_GLOB_$(1)) $$@
-	$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
-
-$$(HLIB0_H_$(1))/$(CFG_LIBRUSTC_$(1)): \
-		$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_LIBRUSTC_$(1)) \
-		| $(HLIB0_H_$(1))/
-	@$$(call E, cp: $$@)
-	$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(4)),$$(notdir $$@))
-	$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(LIBRUSTC_GLOB_$(1)) $$@
-	$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(4)),$$(notdir $$@))
-
-$$(HLIB0_H_$(1))/$(CFG_RUSTLLVM_$(1)): \
-		$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_RUSTLLVM_$(1)) \
-		| $(HLIB0_H_$(1))/
-	@$$(call E, cp: $$@)
-	$$(Q)cp $$< $$@
-
 endef
 
 # Use stage1 to build other architectures: then you don't have to wait
diff --git a/src/rt/rust_upcall.c b/src/rt/rust_upcall.c
index 18b71fbb179..6a3e7b7513c 100644
--- a/src/rt/rust_upcall.c
+++ b/src/rt/rust_upcall.c
@@ -78,15 +78,6 @@ upcall_rust_personality(int version,
     return args.retval;
 }
 
-// NOTE: remove after stage0
-// Landing pads need to call this to insert the
-// correct limit into TLS.
-// NB: This must run on the Rust stack because it
-// needs to acquire the value of the stack pointer
-void
-upcall_reset_stack_limit() {
-}
-
 //
 // Local Variables:
 // mode: C++
diff --git a/src/snapshots.txt b/src/snapshots.txt
index b9be50701d9..1a93b20c886 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2013-12-07 49b751d
+  freebsd-x86_64 b604a8c1846067756488d7d46f382328b35ae492
+  linux-i386 e3c11032b19a74b86b5b6f271ee7457ce0b00d48
+  linux-x86_64 e33ed8c5872144e0d3ba5785db700511766a4653
+  macos-i386 4e4cca6d947c3984bd280a2c7606dd22db1b32f4
+  macos-x86_64 492d28b86de14c8c359ab6dfbe7efc15f6305269
+  winnt-i386 3075b0033433bd5449f27d0b6039e8ab939e27c2
+
 S 2013-12-04 9169579
   freebsd-x86_64 0dc6dcd9435e23c891b9e9e37d483e92cfe51449
   linux-i386 9802f6ba319bec4dd02299af08e421270ede5f5f