Skip to content

Commit 2f9d97c

Browse files
borsbors
committed
---
yaml --- r: 79403 b: refs/heads/snap-stage3 c: 422dcbd h: refs/heads/master i: 79401: bee114d 79399: 3e5e5c8 v: v3
1 parent b08f2d9 commit 2f9d97c

Some content is hidden

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

51 files changed

+809
-407
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 124eb2119c78651cfaaa7a046a101fa2e20f83ca
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: c7352e6403331b0464d1b1e1ccfc9a0f7b67e50b
4+
refs/heads/snap-stage3: 422dcbd56d1a1888f1491d8fb14bb87a54fadbc7
55
refs/heads/try: ac820906c0e53eab79a98ee64f7231f57c3887b4
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/Makefile.in

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -574,19 +574,10 @@ ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
574574
$(foreach host,$(CFG_HOST_TRIPLES), \
575575
all-target-$(target)-host-$(host)))
576576

577-
all: rustllvm/llvm-auto-clean-stamp \
578-
$(ALL_TARGET_RULES) $(GENERATED) docs
577+
all: $(ALL_TARGET_RULES) $(GENERATED) docs
579578

580579
endif
581580

582-
# This is used to independently force an LLVM clean rebuild
583-
# when we changed something not otherwise captured by builtin
584-
# dependencies. In these cases, commit a change that touches
585-
# the stamp in the source dir.
586-
rustllvm/llvm-auto-clean-stamp: $(S)src/rustllvm/llvm-auto-clean-trigger
587-
$(Q)$(MAKE) clean-llvm
588-
touch $@
589-
590581

591582
######################################################################
592583
# Re-configuration

‎branches/snap-stage3/configure

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -664,32 +664,29 @@ do
664664
make_dir $i
665665
done
666666

667-
make_dir llvm
668667
for t in $CFG_HOST_TRIPLES
669668
do
670-
make_dir llvm/$t
669+
make_dir $t/llvm
671670
done
672671

673-
make_dir rustllvm
674672
for t in $CFG_HOST_TRIPLES
675673
do
676-
make_dir rustllvm/$t
674+
make_dir $t/rustllvm
677675
done
678676

679-
make_dir rt
680677
for t in $CFG_TARGET_TRIPLES
681678
do
682-
make_dir rt/$t
679+
make_dir $t/rt
683680
for s in 0 1 2 3
684681
do
685-
make_dir rt/$t/stage$s
682+
make_dir $t/rt/stage$s
686683
for i in \
687684
isaac linenoise sync test \
688685
arch/i386 arch/x86_64 arch/arm arch/mips \
689686
libuv libuv/src/ares libuv/src/eio libuv/src/ev \
690687
jemalloc
691688
do
692-
make_dir rt/$t/stage$s/$i
689+
make_dir $t/rt/stage$s/$i
693690
done
694691
done
695692
done
@@ -791,7 +788,7 @@ do
791788

792789
if [ -z $CFG_LLVM_ROOT ]
793790
then
794-
LLVM_BUILD_DIR=${CFG_BUILD_DIR}llvm/$t
791+
LLVM_BUILD_DIR=${CFG_BUILD_DIR}$t/llvm
795792
if [ ! -z "$CFG_DISABLE_OPTIMIZE_LLVM" ]
796793
then
797794
LLVM_DBG_OPTS="--enable-debug-symbols --disable-optimized"

‎branches/snap-stage3/mk/clean.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,17 @@ clean: clean-misc $(CLEAN_STAGE_RULES)
3333

3434
clean-misc:
3535
@$(call E, cleaning)
36-
$(Q)find rustllvm rt $(CFG_BUILD_TRIPLE)/test \
36+
$(Q)find $(CFG_BUILD_TRIPLE)/rustllvm \
37+
$(CFG_BUILD_TRIPLE)/rt \
38+
$(CFG_BUILD_TRIPLE)/test \
3739
-name '*.[odasS]' -o \
3840
-name '*.so' -o \
3941
-name '*.dylib' -o \
4042
-name '*.dll' -o \
4143
-name '*.def' -o \
4244
-name '*.bc' \
4345
| xargs rm -f
44-
$(Q)find rustllvm rt $(CFG_BUILD_TRIPLE)\
46+
$(Q)find $(CFG_BUILD_TRIPLE)\
4547
-name '*.dSYM' \
4648
| xargs rm -Rf
4749
$(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF)

‎branches/snap-stage3/mk/llvm.mk

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,22 @@ define DEF_LLVM_RULES
2424
# If CFG_LLVM_ROOT is defined then we don't build LLVM ourselves
2525
ifeq ($(CFG_LLVM_ROOT),)
2626

27-
$$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS)
27+
LLVM_STAMP_$(1) = $$(CFG_LLVM_BUILD_DIR_$(1))/llvm-auto-clean-stamp
28+
29+
$$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS) $$(LLVM_STAMP_$(1))
2830
@$$(call E, make: llvm)
2931
$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV)
3032
$$(Q)touch $$(LLVM_CONFIG_$(1))
3133
endif
3234

35+
# This is used to independently force an LLVM clean rebuild
36+
# when we changed something not otherwise captured by builtin
37+
# dependencies. In these cases, commit a change that touches
38+
# the stamp in the source dir.
39+
$$(LLVM_STAMP_$(1)): $(S)src/rustllvm/llvm-auto-clean-trigger
40+
$(Q)$(MAKE) clean-llvm
41+
touch $$@
42+
3343
endef
3444

3545
$(foreach host,$(CFG_HOST_TRIPLES), \

‎branches/snap-stage3/mk/rt.mk

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ RUNTIME_CXXS_$(1)_$(2) := \
7676
rt/rust_upcall.cpp \
7777
rt/rust_uv.cpp \
7878
rt/rust_crate_map.cpp \
79-
rt/rust_log.cpp \
8079
rt/isaac/randport.cpp \
8180
rt/miniz.cpp \
8281
rt/memory_region.cpp \
@@ -92,61 +91,64 @@ RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
9291
rt/arch/$$(HOST_$(1))/ccall.S \
9392
rt/arch/$$(HOST_$(1))/record_sp.S
9493

94+
RT_OUTPUT_DIR_$(1) := $(1)/rt
95+
RT_BUILD_DIR_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/stage$(2)
96+
9597
ifeq ($$(CFG_WINDOWSY_$(1)), 1)
9698
LIBUV_OSTYPE_$(1)_$(2) := win
97-
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
98-
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/jemalloc.lib
99+
LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a
100+
JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/jemalloc.lib
99101
else ifeq ($(OSTYPE_$(1)), apple-darwin)
100102
LIBUV_OSTYPE_$(1)_$(2) := mac
101-
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
102-
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
103+
LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a
104+
JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a
103105
else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
104106
LIBUV_OSTYPE_$(1)_$(2) := unix/freebsd
105-
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
106-
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
107+
LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a
108+
JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a
107109
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
108110
LIBUV_OSTYPE_$(1)_$(2) := unix/android
109-
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
110-
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
111+
LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a
112+
JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a
111113
else
112114
LIBUV_OSTYPE_$(1)_$(2) := unix/linux
113-
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
114-
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
115+
LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a
116+
JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a
115117
endif
116118

117-
RUNTIME_DEF_$(1)_$(2) := rt/rustrt$(CFG_DEF_SUFFIX_$(1))
119+
RUNTIME_DEF_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/rustrt$$(CFG_DEF_SUFFIX_$(1))
118120
RUNTIME_INCS_$(1)_$(2) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
119121
-I $$(S)src/rt/arch/$$(HOST_$(1)) \
120122
-I $$(S)src/rt/linenoise \
121123
-I $$(S)src/libuv/include
122-
RUNTIME_OBJS_$(1)_$(2) := $$(RUNTIME_CXXS_$(1)_$(2):rt/%.cpp=rt/$(1)/stage$(2)/%.o) \
123-
$$(RUNTIME_CS_$(1)_$(2):rt/%.c=rt/$(1)/stage$(2)/%.o) \
124-
$$(RUNTIME_S_$(1)_$(2):rt/%.S=rt/$(1)/stage$(2)/%.o)
124+
RUNTIME_OBJS_$(1)_$(2) := $$(RUNTIME_CXXS_$(1)_$(2):rt/%.cpp=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \
125+
$$(RUNTIME_CS_$(1)_$(2):rt/%.c=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \
126+
$$(RUNTIME_S_$(1)_$(2):rt/%.S=$$(RT_BUILD_DIR_$(1)_$(2))/%.o)
125127
ALL_OBJ_FILES += $$(RUNTIME_OBJS_$(1)_$(2))
126128

127-
MORESTACK_OBJ_$(1)_$(2) := rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/morestack.o
129+
MORESTACK_OBJ_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/morestack.o
128130
ALL_OBJ_FILES += $$(MORESTACK_OBJS_$(1)_$(2))
129131

130-
rt/$(1)/stage$(2)/%.o: rt/%.cpp $$(MKFILE_DEPS)
132+
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.cpp $$(MKFILE_DEPS)
131133
@$$(call E, compile: $$@)
132134
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@, $$(RUNTIME_INCS_$(1)_$(2)) \
133135
$$(SNAP_DEFINES) $$(RUNTIME_CXXFLAGS_$(1)_$(2))) $$<
134136

135-
rt/$(1)/stage$(2)/%.o: rt/%.c $$(MKFILE_DEPS)
137+
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.c $$(MKFILE_DEPS)
136138
@$$(call E, compile: $$@)
137139
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, $$(RUNTIME_INCS_$(1)_$(2)) \
138140
$$(SNAP_DEFINES) $$(RUNTIME_CFLAGS_$(1)_$(2))) $$<
139141

140-
rt/$(1)/stage$(2)/%.o: rt/%.S $$(MKFILE_DEPS) \
142+
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.S $$(MKFILE_DEPS) \
141143
$$(LLVM_CONFIG_$$(CFG_BUILD_TRIPLE))
142144
@$$(call E, compile: $$@)
143145
$$(Q)$$(call CFG_ASSEMBLE_$(1),$$@,$$<)
144146

145-
rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
147+
$$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
146148
@$$(call E, link: $$@)
147149
$$(Q)$(AR_$(1)) rcs $$@ $$<
148150

149-
rt/$(1)/stage$(2)/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
151+
$$(RT_BUILD_DIR_$(1)_$(2))/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
150152
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1)_$(2)) $$(JEMALLOC_LIB_$(1)_$(2))
151153
@$$(call E, link: $$@)
152154
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)_$(2)) \
@@ -172,7 +174,7 @@ endif
172174
ifdef CFG_WINDOWSY_$(1)
173175
$$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
174176
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
175-
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/libuv" \
177+
builddir_name="$$(CFG_BUILD_DIR)/$$(RT_BUILD_DIR_$(1)_$(2))/libuv" \
176178
OS=mingw \
177179
V=$$(VERBOSE)
178180
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
@@ -186,7 +188,7 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
186188
AR="$$(AR_$(1))" \
187189
PLATFORM=android \
188190
BUILDTYPE=Release \
189-
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/libuv" \
191+
builddir_name="$$(CFG_BUILD_DIR)/$$(RT_BUILD_DIR_$(1)_$(2))/libuv" \
190192
host=android OS=linux \
191193
V=$$(VERBOSE)
192194
else
@@ -197,59 +199,59 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
197199
CC="$$(CC_$(1))" \
198200
CXX="$$(CXX_$(1))" \
199201
AR="$$(AR_$(1))" \
200-
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/libuv" \
202+
builddir_name="$$(CFG_BUILD_DIR)/$$(RT_BUILD_DIR_$(1)_$(2))/libuv" \
201203
V=$$(VERBOSE)
202204
endif
203205

204206
ifeq ($(OSTYPE_$(1)), linux-androideabi)
205207
$$(JEMALLOC_LIB_$(1)_$(2)):
206-
cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \
208+
cd $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc; $(S)src/rt/jemalloc/configure \
207209
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) --disable-tls \
208210
EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
209211
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
210212
CC="$$(CC_$(1))" \
211213
CXX="$$(CXX_$(1))" \
212214
AR="$$(AR_$(1))"
213-
$$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc
215+
$$(Q)$$(MAKE) -C $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc
214216
else
215217
$$(JEMALLOC_LIB_$(1)_$(2)):
216-
cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \
218+
cd $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc; $(S)src/rt/jemalloc/configure \
217219
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) \
218220
EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
219221
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
220222
CC="$$(CC_$(1))" \
221223
CXX="$$(CXX_$(1))" \
222224
AR="$$(AR_$(1))"
223-
$$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc
225+
$$(Q)$$(MAKE) -C $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc
224226
endif
225227

226228

227229
# These could go in rt.mk or rustllvm.mk, they're needed for both.
228230

229231
# This regexp has a single $, escaped twice
230-
%.bsd.def: %.def.in $$(MKFILE_DEPS)
232+
$(1)/%.bsd.def: %.def.in $$(MKFILE_DEPS)
231233
@$$(call E, def: $$@)
232234
$$(Q)echo "{" > $$@
233235
$$(Q)sed 's/.$$$$/&;/' $$< >> $$@
234236
$$(Q)echo "};" >> $$@
235237

236-
%.linux.def: %.def.in $$(MKFILE_DEPS)
238+
$(1)/%.linux.def: %.def.in $$(MKFILE_DEPS)
237239
@$$(call E, def: $$@)
238240
$$(Q)echo "{" > $$@
239241
$$(Q)sed 's/.$$$$/&;/' $$< >> $$@
240242
$$(Q)echo "};" >> $$@
241243

242-
%.darwin.def: %.def.in $$(MKFILE_DEPS)
244+
$(1)/%.darwin.def: %.def.in $$(MKFILE_DEPS)
243245
@$$(call E, def: $$@)
244246
$$(Q)sed 's/^./_&/' $$< > $$@
245247

246-
%.android.def: %.def.in $$(MKFILE_DEPS)
248+
$(1)/%.android.def: %.def.in $$(MKFILE_DEPS)
247249
@$$(call E, def: $$@)
248250
$$(Q)echo "{" > $$@
249251
$$(Q)sed 's/.$$$$/&;/' $$< >> $$@
250252
$$(Q)echo "};" >> $$@
251253

252-
%.mingw32.def: %.def.in $$(MKFILE_DEPS)
254+
$(1)/%.mingw32.def: %.def.in $$(MKFILE_DEPS)
253255
@$$(call E, def: $$@)
254256
$$(Q)echo LIBRARY $$* > $$@
255257
$$(Q)echo EXPORTS >> $$@

‎branches/snap-stage3/mk/rustllvm.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ endif
2424

2525
RUSTLLVM_OBJS_CS_$(1) := $$(addprefix rustllvm/, RustWrapper.cpp PassWrapper.cpp)
2626

27-
RUSTLLVM_DEF_$(1) := rustllvm/rustllvm$(CFG_DEF_SUFFIX_$(1))
27+
RUSTLLVM_DEF_$(1) := $(1)/rustllvm/rustllvm$(CFG_DEF_SUFFIX_$(1))
2828

2929
RUSTLLVM_INCS_$(1) = $$(LLVM_EXTRA_INCDIRS_$(1)) \
3030
-iquote $$(LLVM_INCDIR_$(1)) \
3131
-iquote $$(S)src/rustllvm/include
32-
RUSTLLVM_OBJS_OBJS_$(1) := $$(RUSTLLVM_OBJS_CS_$(1):rustllvm/%.cpp=rustllvm/$(1)/%.o)
32+
RUSTLLVM_OBJS_OBJS_$(1) := $$(RUSTLLVM_OBJS_CS_$(1):rustllvm/%.cpp=$(1)/rustllvm/%.o)
3333
ALL_OBJ_FILES += $$(RUSTLLVM_OBJS_OBJS_$(1))
3434

35-
rustllvm/$(1)/$(CFG_RUSTLLVM_$(1)): $$(RUSTLLVM_OBJS_OBJS_$(1)) \
35+
$(1)/rustllvm/$(CFG_RUSTLLVM_$(1)): $$(RUSTLLVM_OBJS_OBJS_$(1)) \
3636
$$(MKFILE_DEPS) $$(RUSTLLVM_DEF_$(1))
3737
@$$(call E, link: $$@)
3838
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@,$$(RUSTLLVM_OBJS_OBJS_$(1)) \
3939
$$(CFG_GCCISH_PRE_LIB_FLAGS_$(1)) $$(LLVM_LIBS_$(1)) \
4040
$$(CFG_GCCISH_POST_LIB_FLAGS_$(1)) \
4141
$$(LLVM_LDFLAGS_$(1)),$$(RUSTLLVM_DEF_$(1)),$$(CFG_RUSTLLVM_$(1)))
4242

43-
rustllvm/$(1)/%.o: rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
43+
$(1)/rustllvm/%.o: rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
4444
@$$(call E, compile: $$@)
4545
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@, $$(LLVM_CXXFLAGS_$(1)) $$(RUSTLLVM_INCS_$(1))) $$<
4646
endef

‎branches/snap-stage3/mk/target.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ WFLAGS_ST2 = -D warnings
3939
define TARGET_STAGE_N
4040

4141
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
42-
rt/$(2)/stage$(1)/arch/$$(HOST_$(2))/libmorestack.a \
42+
$(2)/rt/stage$(1)/arch/$$(HOST_$(2))/libmorestack.a \
4343
| $$(TLIB$(1)_T_$(2)_H_$(3))/ \
4444
$(SNAPSHOT_RUSTC_POST_CLEANUP)
4545
@$$(call E, cp: $$@)
4646
$$(Q)cp $$< $$@
4747

4848
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2)): \
49-
rt/$(2)/stage$(1)/$(CFG_RUNTIME_$(2)) \
49+
$(2)/rt/stage$(1)/$(CFG_RUNTIME_$(2)) \
5050
| $$(TLIB$(1)_T_$(2)_H_$(3))/ \
5151
$(SNAPSHOT_RUSTC_POST_CLEANUP)
5252
@$$(call E, cp: $$@)
@@ -86,7 +86,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
8686
ifneq ($$(findstring $(2),$$(CFG_HOST_TRIPLES)),)
8787

8888
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)): \
89-
rustllvm/$(2)/$(CFG_RUSTLLVM_$(3)) \
89+
$(2)/rustllvm/$(CFG_RUSTLLVM_$(3)) \
9090
| $$(TLIB$(1)_T_$(2)_H_$(3))/ \
9191
$(SNAPSHOT_RUSTC_POST_CLEANUP)
9292
@$$(call E, cp: $$@)

‎branches/snap-stage3/src/compiletest/compiletest.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,9 @@ pub fn make_test_name(config: &config, testfile: &Path) -> test::TestName {
307307
// Try to elide redundant long paths
308308
fn shorten(path: &Path) -> ~str {
309309
let filename = path.filename();
310-
let dir = path.pop().filename();
311-
fmt!("%s/%s", dir.unwrap_or_default(~""), filename.unwrap_or_default(~""))
310+
let p = path.pop();
311+
let dir = p.filename();
312+
fmt!("%s/%s", dir.unwrap_or_default(""), filename.unwrap_or_default(""))
312313
}
313314

314315
test::DynTestName(fmt!("[%s] %s",

‎branches/snap-stage3/src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ fn _arm_push_aux_shared_library(config: &config, testfile: &Path) {
880880
let dirs = os::list_dir_path(&Path(tstr));
881881
for file in dirs.iter() {
882882

883-
if (file.filetype() == Some(~".so")) {
883+
if (file.filetype() == Some(".so")) {
884884

885885
let copy_result = procsrv::run("", config.adb_path,
886886
[~"push", file.to_str(), config.adb_test_dir.clone()],

‎branches/snap-stage3/src/libextra/ebml.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ pub mod reader {
410410
}
411411

412412
fn read_bool(&mut self) -> bool {
413-
doc_as_u8(self.next_doc(EsBool)) as bool
413+
doc_as_u8(self.next_doc(EsBool)) != 0
414414
}
415415

416416
fn read_f64(&mut self) -> f64 {

0 commit comments

Comments
 (0)