Skip to content

Commit 94c6d99

Browse files
pcwaltonpcwalton
committed
---
yaml --- r: 3023 b: refs/heads/master c: 7b7c746 h: refs/heads/master i: 3021: e3cd260 3019: 8b10246 3015: 9ac523d 3007: 28d49db v: v3
1 parent 11f00e8 commit 94c6d99

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+5904
-3690
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 1377e9b341a03915c48a564fb30e70022d04c78f
2+
refs/heads/master: 7b7c746c1e92fe9fa50a94396dfe5efae0034df9

‎trunk/AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Jason Orendorff <[email protected]>
1717
Jeff Balogh <[email protected]>
1818
Jeff Muizelaar <[email protected]>
1919
Jeffrey Yasskin <[email protected]>
20+
Josh Matthews <[email protected]>
2021
Kelly Wilson <[email protected]>
2122
Lindsey Kuper <[email protected]>
2223
Marijn Haverbeke <[email protected]>

‎trunk/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
144144
######################################################################
145145

146146
LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
147-
SREQ0 := stage0/rustc$(X) $(LREQ) stage1/glue.o stage1/$(CFG_STDLIB)
148-
SREQ1 := stage1/rustc$(X) $(LREQ) stage2/glue.o stage2/$(CFG_STDLIB)
149-
SREQ2 := stage2/rustc$(X) $(LREQ) stage3/glue.o stage3/$(CFG_STDLIB)
147+
SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage1/glue.o stage1/$(CFG_STDLIB)
148+
SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage2/glue.o stage2/$(CFG_STDLIB)
149+
SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage3/glue.o stage3/$(CFG_STDLIB)
150150

151151

152152
######################################################################

‎trunk/mk/clean.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ clean:
2828
$(Q)rm -f stage3/rustc$(X) stage3/$(CFG_STDLIB) stage3/glue*
2929
$(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a
3030
$(Q)rm -f rt/$(CFG_RUNTIME)
31+
$(Q)rm -f rt/main.o
3132
$(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist
3233
$(Q)rm -f $(foreach ext,o a d bc s exe,$(wildcard stage*/*.$(ext)))
3334
$(Q)rm -Rf $(foreach ext,out out.tmp \

‎trunk/mk/pp.mk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
2+
PP_INPUTS := $(wildcard $(addprefix $(S)src/lib/,*.rs */*.rs)) \
3+
$(wildcard $(addprefix $(S)src/comp/,*.rs */*.rs */*/*.rs))
4+
15
reformat: $(SREQ1)
26
@$(call E, reformat [stage1]: $@)
3-
for i in $(wildcard $(addprefix $(S)src/comp/, \
4-
*.rs */*.rs */*/*.rs)); \
7+
for i in $(PP_INPUTS); \
58
do $(call CFG_RUN_TARG,stage1, stage1/rustc$(X)) \
69
--pretty $$i >$$i.tmp && mv $$i.tmp $$i; \
710
done

‎trunk/mk/rt.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ rt/%.o: rt/%.s $(MKFILES)
7676
@$(call E, compile: $@)
7777
$(Q)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $<
7878

79+
ifdef CFG_WINDOWSY
80+
rt/main.ll: rt/main.ll.in
81+
sed 's/MAIN/WinMain@16/' < $^ > $@
82+
else
83+
rt/main.ll: rt/main.ll.in
84+
sed 's/MAIN/main/' < $^ > $@
85+
endif
86+
7987
rt/%.o: rt/%.ll $(MKFILES)
8088
@$(call E, llc: $@)
8189
$(Q)$(LLC) -filetype=obj -relocation-model=pic -march=x86 -o $@ $<

‎trunk/mk/stage1.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ stage1/%.o: stage1/%.s
4444
stage1/%$(X): stage1/%.o $(SREQ0)
4545
@$(call E, link [gcc]: $@)
4646
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o -o $@ $< \
47-
-Lstage1 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd -lm
47+
-Lstage1 -Lrustllvm -Lrt rt/main.o -lrustrt -lrustllvm -lstd -lm
4848
@# dsymutil sometimes fails or prints a warning, but the
4949
@# program still runs. Since it simplifies debugging other
5050
@# programs, I\'ll live with the noise.

‎trunk/mk/stage2.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ stage2/%.o: stage2/%.s
4444
stage2/%$(X): stage2/%.o $(SREQ1)
4545
@$(call E, link [gcc]: $@)
4646
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o -o $@ $< \
47-
-Lstage2 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd -lm
47+
-Lstage2 -Lrustllvm -Lrt rt/main.o -lrustrt -lrustllvm -lstd -lm
4848
@# dsymutil sometimes fails or prints a warning, but the
4949
@# program still runs. Since it simplifies debugging other
5050
@# programs, I\'ll live with the noise.

‎trunk/mk/stage3.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ stage3/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
2323
$(STAGE2) -c -o $@ $<
2424

2525
stage3/glue.o: stage2/rustc$(X) stage2/$(CFG_STDLIB) stage2/intrinsics.bc \
26-
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
26+
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
2727
@$(call E, generate: $@)
2828
$(STAGE2) -c -o $@ --glue
2929

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

‎trunk/mk/tests.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ compile-check: tidy \
185185
%.stage0$(X): %.stage0.o $(SREQ0)
186186
@$(call E, link [gcc]: $@)
187187
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o -o $@ $< \
188-
-Lstage1 -Lrt -lrustrt -lstd -lm
188+
-Lstage1 -Lrt rt/main.o -lrustrt -lstd -lm
189189
@# dsymutil sometimes fails or prints a warning, but the
190190
@# program still runs. Since it simplifies debugging other
191191
@# programs, I\'ll live with the noise.
@@ -194,7 +194,7 @@ compile-check: tidy \
194194
%.stage1$(X): %.stage1.o $(SREQ1)
195195
@$(call E, link [gcc]: $@)
196196
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o -o $@ $< \
197-
-Lstage2 -Lrt -lrustrt -lstd -lm
197+
-Lstage2 -Lrt rt/main.o -lrustrt -lstd -lm
198198
@# dsymutil sometimes fails or prints a warning, but the
199199
@# program still runs. Since it simplifies debugging other
200200
@# programs, I\'ll live with the noise.
@@ -203,7 +203,7 @@ compile-check: tidy \
203203
%.stage2$(X): %.stage2.o $(SREQ2)
204204
@$(call E, link [gcc]: $@)
205205
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o -o $@ $< \
206-
-Lstage3 -Lrt -lrustrt -lstd -lm
206+
-Lstage3 -Lrt rt/main.o -lrustrt -lstd -lm
207207
@# dsymutil sometimes fails or prints a warning, but the
208208
@# program still runs. Since it simplifies debugging other
209209
@# programs, I\'ll live with the noise.

0 commit comments

Comments
 (0)