Expansion of rules to cover stage1, stage2 in more cases. Fix typo in makefile.

1 files changed, 88 insertions, 5 deletions

diff --git a/Makefile.in b/Makefile.in
index fac60463cc4..c34b3bf6204 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -633,14 +633,20 @@ ALL_TEST_INPUTS = $(wildcard $(S)src/test/*/*.rs   \
 
 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
 endif
 
 BENCH_RS = $(wildcard $(S)src/test/bench/shootout/*.rs) \
@@ -655,13 +661,21 @@ 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 = \
@@ -670,22 +684,40 @@ TEST_RPASS_EXES_BOOT = \
 TEST_RPASS_EXES_STAGE0 = \
   $(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE0:.rc=.stage0$(X))) \
   $(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE0:.rs=.stage0$(X)))
+TEST_RPASS_EXES_STAGE1 = \
+  $(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE1:.rc=.stage1$(X))) \
+  $(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE1:.rs=.stage1$(X)))
+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 = \
+  $(TEST_RPASS_EXES_STAGE1:.stage1$(X)=.stage1.out)
+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 = \
+  $(TEST_RPASS_EXES_STAGE1:.stage1$(X)=.stage1$(X).tmp)
+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))) \
@@ -693,22 +725,39 @@ TEST_RFAIL_EXES_BOOT = \
 TEST_RFAIL_EXES_STAGE0 = \
   $(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE0:.rc=.stage0$(X))) \
   $(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE0:.rs=.stage0$(X)))
+TEST_RFAIL_EXES_STAGE1 = \
+  $(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE1:.rc=.stage1$(X))) \
+  $(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE1:.rs=.stage1$(X)))
+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 = \
+  $(TEST_RFAIL_EXES_STAGE0:.stage1$(X)=.stage1.out)
+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 = \
+  $(TEST_RFAIL_EXES_STAGE1:.stage1$(X)=.stage1$(X).tmp)
+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))) \
@@ -716,16 +765,30 @@ TEST_CFAIL_EXES_BOOT = \
 TEST_CFAIL_EXES_STAGE0 = \
   $(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE0:.rc=.stage0$(X))) \
   $(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE0:.rs=.stage0$(X)))
+TEST_CFAIL_EXES_STAGE1 = \
+  $(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE1:.rc=.stage1$(X))) \
+  $(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE1:.rs=.stage1$(X)))
+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 = \
+  $(TEST_CFAIL_EXES_STAGE1:.stage1$(X)=.stage1.out)
+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 = \
+  $(TEST_CFAIL_EXES_STAGE1:.stage1$(X)=.stage1$(X).tmp)
+TEST_CFAIL_TMPS_STAGE0 = \
+  $(TEST_CFAIL_EXES_STAGE2:.stage2$(X)=.stage2$(X).tmp)
 
 
 ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_BOOT) \
@@ -733,14 +796,26 @@ ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_BOOT) \
                    $(TEST_RPASS_CRATES_BOOT) \
                    $(TEST_CFAIL_CRATES_STAGE0) \
                    $(TEST_RFAIL_CRATES_STAGE0) \
-                   $(TEST_RPASS_CRATES_STAGE0)
+                   $(TEST_RPASS_CRATES_STAGE0) \
+                   $(TEST_CFAIL_CRATES_STAGE1) \
+                   $(TEST_RFAIL_CRATES_STAGE1) \
+                   $(TEST_RPASS_CRATES_STAGE1) \
+                   $(TEST_CFAIL_CRATES_STAGE2) \
+                   $(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) \
                     $(TEST_RFAIL_SOURCES_STAGE0) \
-                    $(TEST_RPASS_SOURCES_STAGE0)
+                    $(TEST_RPASS_SOURCES_STAGE0) \
+                    $(TEST_CFAIL_SOURCES_STAGE1) \
+                    $(TEST_RFAIL_SOURCES_STAGE1) \
+                    $(TEST_RPASS_SOURCES_STAGE1) \
+                    $(TEST_CFAIL_SOURCES_STAGE2) \
+                    $(TEST_RFAIL_SOURCES_STAGE2) \
+                    $(TEST_RPASS_SOURCES_STAGE2)
 
 # The test suite currently relies on logging to validate results so
 # make sure that logging uses the default configuration
@@ -757,11 +832,19 @@ check: tidy \
        $(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)
 
 
 compile-check: tidy \
        $(TEST_RPASS_EXES_BOOT) $(TEST_RFAIL_EXES_BOOT) \
-       $(TEST_RPASS_EXES_STAGE0) $(TEST_RFAIL_EXES_STAGE0)
+       $(TEST_RPASS_EXES_STAGE0) $(TEST_RFAIL_EXES_STAGE0) \
+       $(TEST_RPASS_EXES_STAGE1) $(TEST_RFAIL_EXES_STAGE1) \
+       $(TEST_RPASS_EXES_STAGE2) $(TEST_RFAIL_EXES_STAGE2)
 
 
 ######################################################################
@@ -777,7 +860,7 @@ compile-check: tidy \
 	@# programs, I\'ll live with the noise.
 	-$(Q)$(CFG_DSYMUTIL) $@
 
-%.stage1(X): %.stage1.o $(SREQ1)
+%.stage1$(X): %.stage1.o $(SREQ1)
 	@$(call E, link [gcc]: $@)
 	$(Q)gcc $(CFG_GCC_CFLAGS) stage1/glue.o -o $@ $< \
       -Lstage1 -Lrt -lrustrt -lstd -lm