mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use main.o directly now that stage0 is ok with it.

Browse source
This commit is contained in:
Rafael Ávila de Espíndola 2011-06-08 13:33:35 -04:00
parent 124ad321ad
commit 2c16be424b
7 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.in
View file

@ -144,9 +144,9 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
###################################################################### ######################################################################
LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM) LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.a stage1/glue.o stage1/$(CFG_STDLIB) SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage1/glue.o stage1/$(CFG_STDLIB)
SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.a stage2/glue.o stage2/$(CFG_STDLIB) SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage2/glue.o stage2/$(CFG_STDLIB)
SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.a stage3/glue.o stage3/$(CFG_STDLIB) SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage3/glue.o stage3/$(CFG_STDLIB)
###################################################################### ######################################################################

1
mk/clean.mk
View file

@ -29,7 +29,6 @@ clean:
$(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a $(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a
$(Q)rm -f rt/$(CFG_RUNTIME) $(Q)rm -f rt/$(CFG_RUNTIME)
$(Q)rm -f rt/main.o $(Q)rm -f rt/main.o
$(Q)rm -f rt/main.a
$(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist $(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist
$(Q)rm -f $(foreach ext,o a d bc s exe,$(wildcard stage*/*.$(ext))) $(Q)rm -f $(foreach ext,o a d bc s exe,$(wildcard stage*/*.$(ext)))
$(Q)rm -Rf $(foreach ext,out out.tmp \ $(Q)rm -Rf $(foreach ext,out out.tmp \

4
mk/rt.mk
View file

@ -84,10 +84,6 @@ rt/main.ll: rt/main.ll.in
sed 's/MAIN/main/' < $^ > $@ sed 's/MAIN/main/' < $^ > $@
endif endif
rt/main.a: rt/main.o
rm -f $@
ar crs $@ $^
rt/%.o: rt/%.ll $(MKFILES) rt/%.o: rt/%.ll $(MKFILES)
@$(call E, llc: $@) @$(call E, llc: $@)
$(Q)$(LLC) -filetype=obj -relocation-model=pic -march=x86 -o $@ $< $(Q)$(LLC) -filetype=obj -relocation-model=pic -march=x86 -o $@ $<

2
mk/stage1.mk
View file

@ -44,7 +44,7 @@ stage1/%.o: stage1/%.s
stage1/%$(X): stage1/%.o $(SREQ0) stage1/%$(X): stage1/%.o $(SREQ0)
@$(call E, link [gcc]: $@) @$(call E, link [gcc]: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o -o $@ $< \ $(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o -o $@ $< \
-Lstage1 -Lrustllvm -Lrt rt/main.a -lrustrt -lrustllvm -lstd -lm -Lstage1 -Lrustllvm -Lrt rt/main.o -lrustrt -lrustllvm -lstd -lm
@# dsymutil sometimes fails or prints a warning, but the @# dsymutil sometimes fails or prints a warning, but the
@# program still runs. Since it simplifies debugging other @# program still runs. Since it simplifies debugging other
@# programs, I\'ll live with the noise. @# programs, I\'ll live with the noise.

2
mk/stage2.mk
View file

@ -44,7 +44,7 @@ stage2/%.o: stage2/%.s
stage2/%$(X): stage2/%.o $(SREQ1) stage2/%$(X): stage2/%.o $(SREQ1)
@$(call E, link [gcc]: $@) @$(call E, link [gcc]: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o -o $@ $< \ $(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o -o $@ $< \
-Lstage2 -Lrustllvm -Lrt rt/main.a -lrustrt -lrustllvm -lstd -lm -Lstage2 -Lrustllvm -Lrt rt/main.o -lrustrt -lrustllvm -lstd -lm
@# dsymutil sometimes fails or prints a warning, but the @# dsymutil sometimes fails or prints a warning, but the
@# program still runs. Since it simplifies debugging other @# program still runs. Since it simplifies debugging other
@# programs, I\'ll live with the noise. @# programs, I\'ll live with the noise.

2
mk/stage3.mk
View file

@ -44,7 +44,7 @@ stage3/%.o: stage3/%.s
stage3/%$(X): stage3/%.o $(SREQ2) stage3/%$(X): stage3/%.o $(SREQ2)
@$(call E, link [gcc]: $@) @$(call E, link [gcc]: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o -o $@ $< \ $(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o -o $@ $< \
-Lstage3 -Lrustllvm -Lrt rt/main.a -lrustrt -lrustllvm -lstd -lm -Lstage3 -Lrustllvm -Lrt rt/main.o -lrustrt -lrustllvm -lstd -lm
@# dsymutil sometimes fails or prints a warning, but the @# dsymutil sometimes fails or prints a warning, but the
@# program still runs. Since it simplifies debugging other @# program still runs. Since it simplifies debugging other
@# programs, I\'ll live with the noise. @# programs, I\'ll live with the noise.

6
mk/tests.mk
View file

@ -185,7 +185,7 @@ compile-check: tidy \
%.stage0$(X): %.stage0.o $(SREQ0) %.stage0$(X): %.stage0.o $(SREQ0)
@$(call E, link [gcc]: $@) @$(call E, link [gcc]: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o -o $@ $< \ $(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o -o $@ $< \
-Lstage1 -Lrt rt/main.a -lrustrt -lstd -lm -Lstage1 -Lrt rt/main.o -lrustrt -lstd -lm
@# dsymutil sometimes fails or prints a warning, but the @# dsymutil sometimes fails or prints a warning, but the
@# program still runs. Since it simplifies debugging other @# program still runs. Since it simplifies debugging other
@# programs, I\'ll live with the noise. @# programs, I\'ll live with the noise.
@ -194,7 +194,7 @@ compile-check: tidy \
%.stage1$(X): %.stage1.o $(SREQ1) %.stage1$(X): %.stage1.o $(SREQ1)
@$(call E, link [gcc]: $@) @$(call E, link [gcc]: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o -o $@ $< \ $(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o -o $@ $< \
-Lstage2 -Lrt rt/main.a -lrustrt -lstd -lm -Lstage2 -Lrt rt/main.o -lrustrt -lstd -lm
@# dsymutil sometimes fails or prints a warning, but the @# dsymutil sometimes fails or prints a warning, but the
@# program still runs. Since it simplifies debugging other @# program still runs. Since it simplifies debugging other
@# programs, I\'ll live with the noise. @# programs, I\'ll live with the noise.
@ -203,7 +203,7 @@ compile-check: tidy \
%.stage2$(X): %.stage2.o $(SREQ2) %.stage2$(X): %.stage2.o $(SREQ2)
@$(call E, link [gcc]: $@) @$(call E, link [gcc]: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o -o $@ $< \ $(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o -o $@ $< \
-Lstage3 -Lrt rt/main.a -lrustrt -lstd -lm -Lstage3 -Lrt rt/main.o -lrustrt -lstd -lm
@# dsymutil sometimes fails or prints a warning, but the @# dsymutil sometimes fails or prints a warning, but the
@# program still runs. Since it simplifies debugging other @# program still runs. Since it simplifies debugging other
@# programs, I\'ll live with the noise. @# programs, I\'ll live with the noise.