Remove everything to do with rustboot from makefiles.

1 files changed, 28 insertions, 68 deletions

diff --git a/mk/tests.mk b/mk/tests.mk
index 1314c6e5..c25715ab 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -6,19 +6,16 @@ ALL_TEST_INPUTS = $(wildcard $(S)src/test/*/*.rs   \
                               $(S)src/test/*/*/*.rs \
                               $(S)src/test/*/*.rc)
 
-TEST_XFAILS_BOOT = $(shell grep -l xfail-boot $(ALL_TEST_INPUTS))
 TEST_XFAILS_STAGE0 = $(shell grep -l xfail-stage0 $(ALL_TEST_INPUTS))
 TEST_XFAILS_STAGE1 = $(shell grep -l xfail-stage1 $(ALL_TEST_INPUTS))
 TEST_XFAILS_STAGE2 = $(shell grep -l xfail-stage2 $(ALL_TEST_INPUTS))
 
 ifdef MINGW_CROSS
-TEST_XFAILS_BOOT += $(S)src/test/run-pass/native-mod.rc
 TEST_XFAILS_STAGE0 += $(S)src/test/run-pass/native-mod.rc
 TEST_XFAILS_STAGE1 += $(S)src/test/run-pass/native-mod.rc
 TEST_XFAILS_STAGE2 += $(S)src/test/run-pass/native-mod.rc
 endif
 ifdef CFG_WINDOWSY
-TEST_XFAILS_BOOT += $(S)src/test/run-pass/native-mod.rc
 TEST_XFAILS_STAGE0 += $(S)src/test/run-pass/native-mod.rc
 TEST_XFAILS_STAGE1 += $(S)src/test/run-pass/native-mod.rc
 TEST_XFAILS_STAGE2 += $(S)src/test/run-pass/native-mod.rc
@@ -34,28 +31,21 @@ CFAIL_RC = $(wildcard $(S)src/test/compile-fail/*.rc)
 CFAIL_RS = $(wildcard $(S)src/test/compile-fail/*.rs)
 
 ifdef CHECK_XFAILS
-TEST_RPASS_CRATES_BOOT = $(filter $(TEST_XFAILS_BOOT), $(RPASS_RC))
 TEST_RPASS_CRATES_STAGE0 = $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RC))
 TEST_RPASS_CRATES_STAGE1 = $(filter $(TEST_XFAILS_STAGE1), $(RPASS_RC))
 TEST_RPASS_CRATES_STAGE2 = $(filter $(TEST_XFAILS_STAGE2), $(RPASS_RC))
-TEST_RPASS_SOURCES_BOOT = $(filter $(TEST_XFAILS_BOOT), $(RPASS_RS))
 TEST_RPASS_SOURCES_STAGE0 = $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RS))
 TEST_RPASS_SOURCES_STAGE1 = $(filter $(TEST_XFAILS_STAGE1), $(RPASS_RS))
 TEST_RPASS_SOURCES_STAGE2 = $(filter $(TEST_XFAILS_STAGE2), $(RPASS_RS))
 else
-TEST_RPASS_CRATES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RC))
 TEST_RPASS_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RC))
 TEST_RPASS_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RPASS_RC))
 TEST_RPASS_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE2), $(RPASS_RC))
-TEST_RPASS_SOURCES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RS))
 TEST_RPASS_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RS))
 TEST_RPASS_SOURCES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RPASS_RS))
 TEST_RPASS_SOURCES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(RPASS_RS))
 endif
 
-TEST_RPASS_EXES_BOOT = \
-  $(subst $(S)src/,,$(TEST_RPASS_CRATES_BOOT:.rc=.boot$(X))) \
-  $(subst $(S)src/,,$(TEST_RPASS_SOURCES_BOOT:.rs=.boot$(X)))
 TEST_RPASS_EXES_STAGE0 = \
   $(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE0:.rc=.stage0$(X))) \
   $(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE0:.rs=.stage0$(X)))
@@ -66,8 +56,6 @@ TEST_RPASS_EXES_STAGE2 = \
   $(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE1:.rc=.stage2$(X))) \
   $(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE1:.rs=.stage2$(X)))
 
-TEST_RPASS_OUTS_BOOT  = \
-  $(TEST_RPASS_EXES_BOOT:.boot$(X)=.boot.out)
 TEST_RPASS_OUTS_STAGE0 = \
   $(TEST_RPASS_EXES_STAGE0:.stage0$(X)=.stage0.out)
 TEST_RPASS_OUTS_STAGE1 = \
@@ -75,8 +63,6 @@ TEST_RPASS_OUTS_STAGE1 = \
 TEST_RPASS_OUTS_STAGE2 = \
   $(TEST_RPASS_EXES_STAGE2:.stage2$(X)=.stage2.out)
 
-TEST_RPASS_TMPS_BOOT  = \
-  $(TEST_RPASS_EXES_BOOT:.boot$(X)=.boot$(X).tmp)
 TEST_RPASS_TMPS_STAGE0 = \
   $(TEST_RPASS_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp)
 TEST_RPASS_TMPS_STAGE1 = \
@@ -85,18 +71,13 @@ TEST_RPASS_TMPS_STAGE2 = \
   $(TEST_RPASS_EXES_STAGE2:.stage2$(X)=.stage2$(X).tmp)
 
 
-TEST_RFAIL_CRATES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RC))
 TEST_RFAIL_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RC))
 TEST_RFAIL_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RFAIL_RC))
 TEST_RFAIL_CRATES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(RFAIL_RC))
-TEST_RFAIL_SOURCES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RS))
 TEST_RFAIL_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RS))
 TEST_RFAIL_SOURCES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(RFAIL_RS))
 TEST_RFAIL_SOURCES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(RFAIL_RS))
 
-TEST_RFAIL_EXES_BOOT = \
-  $(subst $(S)src/,,$(TEST_RFAIL_CRATES_BOOT:.rc=.boot$(X))) \
-  $(subst $(S)src/,,$(TEST_RFAIL_SOURCES_BOOT:.rs=.boot$(X)))
 TEST_RFAIL_EXES_STAGE0 = \
   $(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE0:.rc=.stage0$(X))) \
   $(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE0:.rs=.stage0$(X)))
@@ -107,8 +88,6 @@ TEST_RFAIL_EXES_STAGE2 = \
   $(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE2:.rc=.stage2$(X))) \
   $(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE2:.rs=.stage2$(X)))
 
-TEST_RFAIL_OUTS_BOOT  = \
-  $(TEST_RFAIL_EXES_BOOT:.boot$(X)=.boot.out)
 TEST_RFAIL_OUTS_STAGE0 = \
   $(TEST_RFAIL_EXES_STAGE0:.stage0$(X)=.stage0.out)
 TEST_RFAIL_OUTS_STAGE1 = \
@@ -116,8 +95,6 @@ TEST_RFAIL_OUTS_STAGE1 = \
 TEST_RFAIL_OUTS_STAGE2 = \
   $(TEST_RFAIL_EXES_STAGE0:.stage2$(X)=.stage2.out)
 
-TEST_RFAIL_TMPS_BOOT  = \
-  $(TEST_RFAIL_EXES_BOOT:.boot$(X)=.boot$(X).tmp)
 TEST_RFAIL_TMPS_STAGE0 = \
   $(TEST_RFAIL_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp)
 TEST_RFAIL_TMPS_STAGE1 = \
@@ -125,18 +102,13 @@ TEST_RFAIL_TMPS_STAGE1 = \
 TEST_RFAIL_TMPS_STAGE2 = \
   $(TEST_RFAIL_EXES_STAGE2:.stage2$(X)=.stage2$(X).tmp)
 
-TEST_CFAIL_CRATES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RC))
 TEST_CFAIL_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RC))
 TEST_CFAIL_CRATES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(CFAIL_RC))
 TEST_CFAIL_CRATES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(CFAIL_RC))
-TEST_CFAIL_SOURCES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RS))
 TEST_CFAIL_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RS))
 TEST_CFAIL_SOURCES_STAGE1 = $(filter-out $(TEST_XFAILS_STAGE1), $(CFAIL_RS))
 TEST_CFAIL_SOURCES_STAGE2 = $(filter-out $(TEST_XFAILS_STAGE2), $(CFAIL_RS))
 
-TEST_CFAIL_EXES_BOOT = \
-  $(subst $(S)src/,,$(TEST_CFAIL_CRATES_BOOT:.rc=.boot$(X))) \
-  $(subst $(S)src/,,$(TEST_CFAIL_SOURCES_BOOT:.rs=.boot$(X)))
 TEST_CFAIL_EXES_STAGE0 = \
   $(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE0:.rc=.stage0$(X))) \
   $(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE0:.rs=.stage0$(X)))
@@ -147,8 +119,6 @@ TEST_CFAIL_EXES_STAGE2 = \
   $(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE2:.rc=.stage2$(X))) \
   $(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE2:.rs=.stage2$(X)))
 
-TEST_CFAIL_OUTS_BOOT = \
-  $(TEST_CFAIL_EXES_BOOT:.boot$(X)=.boot.out)
 TEST_CFAIL_OUTS_STAGE0 = \
   $(TEST_CFAIL_EXES_STAGE0:.stage0$(X)=.stage0.out)
 TEST_CFAIL_OUTS_STAGE1 = \
@@ -156,8 +126,6 @@ TEST_CFAIL_OUTS_STAGE1 = \
 TEST_CFAIL_OUTS_STAGE2 = \
   $(TEST_CFAIL_EXES_STAGE0:.stage2$(X)=.stage2.out)
 
-TEST_CFAIL_TMPS_BOOT = \
-  $(TEST_CFAIL_EXES_BOOT:.boot$(X)=.boot$(X).tmp)
 TEST_CFAIL_TMPS_STAGE0 = \
   $(TEST_CFAIL_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp)
 TEST_CFAIL_TMPS_STAGE1 = \
@@ -166,10 +134,7 @@ TEST_CFAIL_TMPS_STAGE0 = \
   $(TEST_CFAIL_EXES_STAGE2:.stage2$(X)=.stage2$(X).tmp)
 
 
-ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_BOOT) \
-                   $(TEST_RFAIL_CRATES_BOOT) \
-                   $(TEST_RPASS_CRATES_BOOT) \
-                   $(TEST_CFAIL_CRATES_STAGE0) \
+ALL_TEST_CRATES =  $(TEST_CFAIL_CRATES_STAGE0) \
                    $(TEST_RFAIL_CRATES_STAGE0) \
                    $(TEST_RPASS_CRATES_STAGE0) \
                    $(TEST_CFAIL_CRATES_STAGE1) \
@@ -179,10 +144,7 @@ ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_BOOT) \
                    $(TEST_RFAIL_CRATES_STAGE2) \
                    $(TEST_RPASS_CRATES_STAGE2)
 
-ALL_TEST_SOURCES = $(TEST_CFAIL_SOURCES_BOOT) \
-                    $(TEST_RFAIL_SOURCES_BOOT) \
-                    $(TEST_RPASS_SOURCES_BOOT) \
-                    $(TEST_CFAIL_SOURCES_STAGE0) \
+ALL_TEST_SOURCES =  $(TEST_CFAIL_SOURCES_STAGE0) \
                     $(TEST_RFAIL_SOURCES_STAGE0) \
                     $(TEST_RPASS_SOURCES_STAGE0) \
                     $(TEST_CFAIL_SOURCES_STAGE1) \
@@ -197,26 +159,23 @@ ALL_TEST_SOURCES = $(TEST_CFAIL_SOURCES_BOOT) \
 unexport RUST_LOG
 
 
-check_nocompile: $(TEST_CFAIL_OUTS_BOOT) \
-                 $(TEST_CFAIL_OUTS_STAGE0)
+check_nocompile: $(TEST_CFAIL_OUTS_STAGE0) \
+                 $(TEST_CFAIL_OUTS_STAGE1) \
+                 $(TEST_CFAIL_OUTS_STAGE2)
 
 check: tidy \
-       $(TEST_RPASS_EXES_BOOT) $(TEST_RFAIL_EXES_BOOT) \
-       $(TEST_RPASS_OUTS_BOOT) $(TEST_RFAIL_OUTS_BOOT) \
-       $(TEST_CFAIL_OUTS_BOOT) \
        $(TEST_RPASS_EXES_STAGE0) $(TEST_RFAIL_EXES_STAGE0) \
        $(TEST_RPASS_OUTS_STAGE0) $(TEST_RFAIL_OUTS_STAGE0) \
-       $(TEST_CFAIL_OUTS_STAGE0)
-#       $(TEST_RPASS_EXES_STAGE1) $(TEST_RFAIL_EXES_STAGE1) \
-#       $(TEST_RPASS_OUTS_STAGE1) $(TEST_RFAIL_OUTS_STAGE1) \
-#       $(TEST_CFAIL_OUTS_STAGE1) \
-#       $(TEST_RPASS_EXES_STAGE2) $(TEST_RFAIL_EXES_STAGE2) \
-#       $(TEST_RPASS_OUTS_STAGE2) $(TEST_RFAIL_OUTS_STAGE2) \
-#       $(TEST_CFAIL_OUTS_STAGE2)
+       $(TEST_CFAIL_OUTS_STAGE0) \
+       $(TEST_RPASS_EXES_STAGE1) $(TEST_RFAIL_EXES_STAGE1) \
+       $(TEST_RPASS_OUTS_STAGE1) $(TEST_RFAIL_OUTS_STAGE1) \
+       $(TEST_CFAIL_OUTS_STAGE1) \
+       $(TEST_RPASS_EXES_STAGE2) $(TEST_RFAIL_EXES_STAGE2) \
+       $(TEST_RPASS_OUTS_STAGE2) $(TEST_RFAIL_OUTS_STAGE2) \
+       $(TEST_CFAIL_OUTS_STAGE2)
 
 
 compile-check: tidy \
-       $(TEST_RPASS_EXES_BOOT) $(TEST_RFAIL_EXES_BOOT) \
        $(TEST_RPASS_EXES_STAGE0) $(TEST_RFAIL_EXES_STAGE0) \
        $(TEST_RPASS_EXES_STAGE1) $(TEST_RFAIL_EXES_STAGE1) \
        $(TEST_RPASS_EXES_STAGE2) $(TEST_RFAIL_EXES_STAGE2)
@@ -254,15 +213,6 @@ compile-check: tidy \
 	-$(Q)$(CFG_DSYMUTIL) $@
 
 
-
-%.boot$(X): %.rs $(BREQ)
-	@$(call E, compile [boot]: $@)
-	$(BOOT) -o $@ $<
-
-%.boot$(X): %.rc $(BREQ)
-	@$(call E, compile [boot]: $@)
-	$(BOOT) -o $@ $<
-
 %.stage0.o: %.rc $(SREQ0)
 	@$(call E, compile [stage0]: $@)
 	$(STAGE0) -c -o $@ $<
@@ -271,6 +221,7 @@ compile-check: tidy \
 	@$(call E, compile [stage0]: $@)
 	$(STAGE0) -c -o $@ $<
 
+
 %.stage1.o: %.rc $(SREQ1)
 	@$(call E, compile [stage1]: $@)
 	$(STAGE1) -c -o $@ $<
@@ -279,6 +230,7 @@ compile-check: tidy \
 	@$(call E, compile [stage1]: $@)
 	$(STAGE1) -c -o $@ $<
 
+
 %.stage2.o: %.rc $(SREQ2)
 	@$(call E, compile [stage2]: $@)
 	$(STAGE2) -c -o $@ $<
@@ -322,18 +274,26 @@ test/run-fail/%.out.tmp: test/run-fail/%$(X) \
       "$$(grep error-pattern $(S)src/test/run-fail/$(basename $*).rs \
         | cut -d : -f 2- | tr -d '\n\r')" $@
 
-test/compile-fail/%.boot.out.tmp: test/compile-fail/%.rs $(BREQ)
-	@$(call E, compile [boot]: $@)
+test/compile-fail/%.stage0.out.tmp: test/compile-fail/%.rs $(SREQ0)
+	@$(call E, compile [stage0]: $@)
 	$(Q)grep -q error-pattern $<
 	$(Q)rm -f $@
-	$(BOOT) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0
+	$(STAGE0) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0
 	$(Q)grep --text --quiet \
       "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@
 
-test/compile-fail/%.stage0.out.tmp: test/compile-fail/%.rs $(SREQ0)
-	@$(call E, compile [stage0]: $@)
+test/compile-fail/%.stage1.out.tmp: test/compile-fail/%.rs $(SREQ1)
+	@$(call E, compile [stage1]: $@)
 	$(Q)grep -q error-pattern $<
 	$(Q)rm -f $@
-	$(STAGE0) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0
+	$(STAGE1) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0
+	$(Q)grep --text --quiet \
+      "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@
+
+test/compile-fail/%.stage2.out.tmp: test/compile-fail/%.rs $(SREQ2)
+	@$(call E, compile [stage2]: $@)
+	$(Q)grep -q error-pattern $<
+	$(Q)rm -f $@
+	$(STAGE2) -o $(@:.out=$(X)) $< >$@ 2>&1; test $$? -ne 0
 	$(Q)grep --text --quiet \
       "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@