Remove the last vestiges of main.ll

Closes #992

Author: marijnh

Makefile.in

@@ -256,8 +256,7 @@ HOST_SREQ$(1) = \
 TARGET_SREQ$(1)$(2) = \
 	$$(HOST_SREQ$(1)) \
 	$$(TARGET_LIB$(1)$(2))/$$(CFG_RUNTIME) \
-	$$(TARGET_LIB$(1)$(2))/intrinsics.bc \
-	$$(TARGET_LIB$(1)$(2))/main.o
+	$$(TARGET_LIB$(1)$(2))/intrinsics.bc
 
 # Prerequisites for complete stageN targets
 SREQ$(1)$(2) = \

mk/clean.mk

@@ -22,8 +22,6 @@ clean-misc:
 	$(Q)rm -f $(GENERATED)
 	$(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a
 	$(Q)rm -f rt/$(CFG_RUNTIME)
-	$(Q)rm -f rt/main.o
-	$(Q)rm -f rt/main.ll
 	$(Q)rm -f rt/libuv/uv.a
 	$(Q)rm -Rf $(wildcard rt/libuv/src/*/*)
 	$(Q)rm -f $(wildcard rt/libuv/src/*.o)
@@ -60,7 +58,6 @@ clean$(1)$(2):
 	$(Q)rm -f $$(TARGET_LIB$(1)$(2))/$(CFG_RUSTLLVM)
 	$(Q)rm -f $$(TARGET_LIB$(1)$(2))/libstd.rlib
 	$(Q)rm -f $$(TARGET_LIB$(1)$(2))/intrinsics.bc
-	$(Q)rm -f $$(TARGET_LIB$(1)$(2))/main.o
 
 endef
 

mk/dist.mk

@@ -40,7 +40,6 @@ PKG_FILES = \
       $(RUNTIME_S)                             \
       rt/rustrt.def.in                         \
       rt/intrinsics/intrinsics.ll.in           \
-      rt/main.ll.in                            \
       $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS)   \
       $(RUSTLLVM_HDR)                          \
       rustllvm/rustllvm.def.in                 \

mk/install.mk

@@ -32,7 +32,6 @@ install-target$(1): $$(SREQ$$(ISTAGE)$(1))
 	$(Q)$(call INSTALL,$$(TL$(1)),$$(PTL$(1)),$$(CFG_RUNTIME))
 	$(Q)$(call INSTALL,$$(TL$(1)),$$(PTL$(1)),$$(CFG_STDLIB))
 	$(Q)$(call INSTALL,$$(TL$(1)),$$(PTL$(1)),intrinsics.bc)
-	$(Q)$(call INSTALL,$$(TL$(1)),$$(PTL$(1)),main.o)
 endef
 
 $(foreach target,$(CFG_TARGET_TRIPLES), \

mk/rt.mk

@@ -102,22 +102,6 @@ rt/%.o: rt/%.S $(MKFILES)
 	@$(call E, compile: $@)
 	$(Q)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $<
 
-ifdef CFG_WINDOWSY
-rt/main.ll: rt/main.ll.in
-	@$(call E, sed: $@)
-	$(Q)sed 's/MAIN/WinMain@16/' < $^ > $@
-rt/main0.ll: rt/main0.ll.in
-	@$(call E, sed: $@)
-	$(Q)sed 's/MAIN/WinMain@16/' < $^ > $@
-else
-rt/main.ll: rt/main.ll.in
-	@$(call E, sed: $@)
-	$(Q)sed 's/MAIN/main/' < $^ > $@
-rt/main0.ll: rt/main0.ll.in
-	@$(call E, sed: $@)
-	$(Q)sed 's/MAIN/main/' < $^ > $@
-endif
-
 rt/%.o: rt/%.ll $(MKFILES)
 	@$(call E, llc: $@)
 	$(Q)$(LLC) -filetype=obj -relocation-model=pic -march=x86 -o $@ $<

mk/target.mk

@@ -23,23 +23,9 @@ $$(TARGET_LIB$(1)$(2))/libstd.rlib: \
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)) --lib --static -o $$@ $$<
 
-ifeq ($(1), 0)
-$$(TARGET_LIB$(1)$(2))/main.o: rt/main0.o
-	@$$(call E, cp: $$@)
-	$$(Q)cp $$< $$@
-
-$$(TARGET_LIB$(1)$(2))/$$(CFG_RUNTIME): stage0/lib/$$(CFG_RUNTIME)
-	@$$(call E, cp: $$@)
-	$$(Q)cp $$< $$@
-else
-$$(TARGET_LIB$(1)$(2))/main.o: rt/main.o
-	@$$(call E, cp: $$@)
-	$$(Q)cp $$< $$@
-
 $$(TARGET_LIB$(1)$(2))/$$(CFG_RUNTIME): rt/$$(CFG_RUNTIME)
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
-endif
 
 $$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM): rustllvm/$$(CFG_RUSTLLVM)
 	@$$(call E, cp: $$@)