Skip to content

Commit 30d7ea6

Browse files
chris-morganchris-morgan
committed
---
yaml --- r: 144743 b: refs/heads/try2 c: da042ce h: refs/heads/master i: 144741: ea314fb 144739: 395096d 144735: 6ee2668 v: v3
1 parent 93c4e11 commit 30d7ea6

Some content is hidden

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

42 files changed

+201
-444
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 510c4d8dcf7fd265efb8cced2a03fd06063b0f6b
8+
refs/heads/try2: da042ce46a022d699dae792164dd180f6dd61894
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/Makefile.in

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

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

579580
endif
580581

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+
581590

582591
######################################################################
583592
# Re-configuration

‎branches/try2/configure

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

667+
make_dir llvm
667668
for t in $CFG_HOST_TRIPLES
668669
do
669-
make_dir $t/llvm
670+
make_dir llvm/$t
670671
done
671672

673+
make_dir rustllvm
672674
for t in $CFG_HOST_TRIPLES
673675
do
674-
make_dir $t/rustllvm
676+
make_dir rustllvm/$t
675677
done
676678

679+
make_dir rt
677680
for t in $CFG_TARGET_TRIPLES
678681
do
679-
make_dir $t/rt
682+
make_dir rt/$t
680683
for s in 0 1 2 3
681684
do
682-
make_dir $t/rt/stage$s
685+
make_dir rt/$t/stage$s
683686
for i in \
684687
isaac linenoise sync test \
685688
arch/i386 arch/x86_64 arch/arm arch/mips \
686689
libuv libuv/src/ares libuv/src/eio libuv/src/ev \
687690
jemalloc
688691
do
689-
make_dir $t/rt/stage$s/$i
692+
make_dir rt/$t/stage$s/$i
690693
done
691694
done
692695
done
@@ -788,7 +791,7 @@ do
788791

789792
if [ -z $CFG_LLVM_ROOT ]
790793
then
791-
LLVM_BUILD_DIR=${CFG_BUILD_DIR}$t/llvm
794+
LLVM_BUILD_DIR=${CFG_BUILD_DIR}llvm/$t
792795
if [ ! -z "$CFG_DISABLE_OPTIMIZE_LLVM" ]
793796
then
794797
LLVM_DBG_OPTS="--enable-debug-symbols --disable-optimized"

‎branches/try2/mk/clean.mk

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

3434
clean-misc:
3535
@$(call E, cleaning)
36-
$(Q)find $(CFG_BUILD_TRIPLE)/rustllvm \
37-
$(CFG_BUILD_TRIPLE)/rt \
38-
$(CFG_BUILD_TRIPLE)/test \
36+
$(Q)find rustllvm rt $(CFG_BUILD_TRIPLE)/test \
3937
-name '*.[odasS]' -o \
4038
-name '*.so' -o \
4139
-name '*.dylib' -o \
4240
-name '*.dll' -o \
4341
-name '*.def' -o \
4442
-name '*.bc' \
4543
| xargs rm -f
46-
$(Q)find $(CFG_BUILD_TRIPLE)\
44+
$(Q)find rustllvm rt $(CFG_BUILD_TRIPLE)\
4745
-name '*.dSYM' \
4846
| xargs rm -Rf
4947
$(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF)

‎branches/try2/mk/llvm.mk

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,12 @@ 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_STAMP_$(1) = $$(CFG_LLVM_BUILD_DIR_$(1))/llvm-auto-clean-stamp
28-
29-
$$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS) $$(LLVM_STAMP_$(1))
27+
$$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS)
3028
@$$(call E, make: llvm)
3129
$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV)
3230
$$(Q)touch $$(LLVM_CONFIG_$(1))
3331
endif
3432

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-
4333
endef
4434

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

‎branches/try2/mk/rt.mk

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -91,64 +91,61 @@ RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
9191
rt/arch/$$(HOST_$(1))/ccall.S \
9292
rt/arch/$$(HOST_$(1))/record_sp.S
9393

94-
RT_OUTPUT_DIR_$(1) := $(1)/rt
95-
RT_BUILD_DIR_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/stage$(2)
96-
9794
ifeq ($$(CFG_WINDOWSY_$(1)), 1)
9895
LIBUV_OSTYPE_$(1)_$(2) := win
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
96+
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
97+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/jemalloc.lib
10198
else ifeq ($(OSTYPE_$(1)), apple-darwin)
10299
LIBUV_OSTYPE_$(1)_$(2) := mac
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
100+
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
101+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
105102
else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
106103
LIBUV_OSTYPE_$(1)_$(2) := unix/freebsd
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
104+
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
105+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
109106
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
110107
LIBUV_OSTYPE_$(1)_$(2) := unix/android
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
108+
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
109+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
113110
else
114111
LIBUV_OSTYPE_$(1)_$(2) := unix/linux
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
112+
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
113+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
117114
endif
118115

119-
RUNTIME_DEF_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/rustrt$$(CFG_DEF_SUFFIX_$(1))
116+
RUNTIME_DEF_$(1)_$(2) := rt/rustrt$(CFG_DEF_SUFFIX_$(1))
120117
RUNTIME_INCS_$(1)_$(2) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
121118
-I $$(S)src/rt/arch/$$(HOST_$(1)) \
122119
-I $$(S)src/rt/linenoise \
123120
-I $$(S)src/libuv/include
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)
121+
RUNTIME_OBJS_$(1)_$(2) := $$(RUNTIME_CXXS_$(1)_$(2):rt/%.cpp=rt/$(1)/stage$(2)/%.o) \
122+
$$(RUNTIME_CS_$(1)_$(2):rt/%.c=rt/$(1)/stage$(2)/%.o) \
123+
$$(RUNTIME_S_$(1)_$(2):rt/%.S=rt/$(1)/stage$(2)/%.o)
127124
ALL_OBJ_FILES += $$(RUNTIME_OBJS_$(1)_$(2))
128125

129-
MORESTACK_OBJ_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/morestack.o
126+
MORESTACK_OBJ_$(1)_$(2) := rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/morestack.o
130127
ALL_OBJ_FILES += $$(MORESTACK_OBJS_$(1)_$(2))
131128

132-
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.cpp $$(MKFILE_DEPS)
129+
rt/$(1)/stage$(2)/%.o: rt/%.cpp $$(MKFILE_DEPS)
133130
@$$(call E, compile: $$@)
134131
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@, $$(RUNTIME_INCS_$(1)_$(2)) \
135132
$$(SNAP_DEFINES) $$(RUNTIME_CXXFLAGS_$(1)_$(2))) $$<
136133

137-
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.c $$(MKFILE_DEPS)
134+
rt/$(1)/stage$(2)/%.o: rt/%.c $$(MKFILE_DEPS)
138135
@$$(call E, compile: $$@)
139136
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, $$(RUNTIME_INCS_$(1)_$(2)) \
140137
$$(SNAP_DEFINES) $$(RUNTIME_CFLAGS_$(1)_$(2))) $$<
141138

142-
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.S $$(MKFILE_DEPS) \
139+
rt/$(1)/stage$(2)/%.o: rt/%.S $$(MKFILE_DEPS) \
143140
$$(LLVM_CONFIG_$$(CFG_BUILD_TRIPLE))
144141
@$$(call E, compile: $$@)
145142
$$(Q)$$(call CFG_ASSEMBLE_$(1),$$@,$$<)
146143

147-
$$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
144+
rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
148145
@$$(call E, link: $$@)
149146
$$(Q)$(AR_$(1)) rcs $$@ $$<
150147

151-
$$(RT_BUILD_DIR_$(1)_$(2))/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
148+
rt/$(1)/stage$(2)/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
152149
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1)_$(2)) $$(JEMALLOC_LIB_$(1)_$(2))
153150
@$$(call E, link: $$@)
154151
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)_$(2)) \
@@ -174,7 +171,7 @@ endif
174171
ifdef CFG_WINDOWSY_$(1)
175172
$$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
176173
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
177-
builddir_name="$$(CFG_BUILD_DIR)/$$(RT_BUILD_DIR_$(1)_$(2))/libuv" \
174+
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/libuv" \
178175
OS=mingw \
179176
V=$$(VERBOSE)
180177
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
@@ -188,7 +185,7 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
188185
AR="$$(AR_$(1))" \
189186
PLATFORM=android \
190187
BUILDTYPE=Release \
191-
builddir_name="$$(CFG_BUILD_DIR)/$$(RT_BUILD_DIR_$(1)_$(2))/libuv" \
188+
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/libuv" \
192189
host=android OS=linux \
193190
V=$$(VERBOSE)
194191
else
@@ -199,59 +196,59 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
199196
CC="$$(CC_$(1))" \
200197
CXX="$$(CXX_$(1))" \
201198
AR="$$(AR_$(1))" \
202-
builddir_name="$$(CFG_BUILD_DIR)/$$(RT_BUILD_DIR_$(1)_$(2))/libuv" \
199+
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/libuv" \
203200
V=$$(VERBOSE)
204201
endif
205202

206203
ifeq ($(OSTYPE_$(1)), linux-androideabi)
207204
$$(JEMALLOC_LIB_$(1)_$(2)):
208-
cd $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc; $(S)src/rt/jemalloc/configure \
205+
cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \
209206
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) --disable-tls \
210207
EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
211208
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
212209
CC="$$(CC_$(1))" \
213210
CXX="$$(CXX_$(1))" \
214211
AR="$$(AR_$(1))"
215-
$$(Q)$$(MAKE) -C $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc
212+
$$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc
216213
else
217214
$$(JEMALLOC_LIB_$(1)_$(2)):
218-
cd $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc; $(S)src/rt/jemalloc/configure \
215+
cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \
219216
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) \
220217
EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
221218
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
222219
CC="$$(CC_$(1))" \
223220
CXX="$$(CXX_$(1))" \
224221
AR="$$(AR_$(1))"
225-
$$(Q)$$(MAKE) -C $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc
222+
$$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc
226223
endif
227224

228225

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

231228
# This regexp has a single $, escaped twice
232-
$(1)/%.bsd.def: %.def.in $$(MKFILE_DEPS)
229+
%.bsd.def: %.def.in $$(MKFILE_DEPS)
233230
@$$(call E, def: $$@)
234231
$$(Q)echo "{" > $$@
235232
$$(Q)sed 's/.$$$$/&;/' $$< >> $$@
236233
$$(Q)echo "};" >> $$@
237234

238-
$(1)/%.linux.def: %.def.in $$(MKFILE_DEPS)
235+
%.linux.def: %.def.in $$(MKFILE_DEPS)
239236
@$$(call E, def: $$@)
240237
$$(Q)echo "{" > $$@
241238
$$(Q)sed 's/.$$$$/&;/' $$< >> $$@
242239
$$(Q)echo "};" >> $$@
243240

244-
$(1)/%.darwin.def: %.def.in $$(MKFILE_DEPS)
241+
%.darwin.def: %.def.in $$(MKFILE_DEPS)
245242
@$$(call E, def: $$@)
246243
$$(Q)sed 's/^./_&/' $$< > $$@
247244

248-
$(1)/%.android.def: %.def.in $$(MKFILE_DEPS)
245+
%.android.def: %.def.in $$(MKFILE_DEPS)
249246
@$$(call E, def: $$@)
250247
$$(Q)echo "{" > $$@
251248
$$(Q)sed 's/.$$$$/&;/' $$< >> $$@
252249
$$(Q)echo "};" >> $$@
253250

254-
$(1)/%.mingw32.def: %.def.in $$(MKFILE_DEPS)
251+
%.mingw32.def: %.def.in $$(MKFILE_DEPS)
255252
@$$(call E, def: $$@)
256253
$$(Q)echo LIBRARY $$* > $$@
257254
$$(Q)echo EXPORTS >> $$@

‎branches/try2/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) := $(1)/rustllvm/rustllvm$(CFG_DEF_SUFFIX_$(1))
27+
RUSTLLVM_DEF_$(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=$(1)/rustllvm/%.o)
32+
RUSTLLVM_OBJS_OBJS_$(1) := $$(RUSTLLVM_OBJS_CS_$(1):rustllvm/%.cpp=rustllvm/$(1)/%.o)
3333
ALL_OBJ_FILES += $$(RUSTLLVM_OBJS_OBJS_$(1))
3434

35-
$(1)/rustllvm/$(CFG_RUSTLLVM_$(1)): $$(RUSTLLVM_OBJS_OBJS_$(1)) \
35+
rustllvm/$(1)/$(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-
$(1)/rustllvm/%.o: rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
43+
rustllvm/$(1)/%.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/try2/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-
$(2)/rt/stage$(1)/arch/$$(HOST_$(2))/libmorestack.a \
42+
rt/$(2)/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-
$(2)/rt/stage$(1)/$(CFG_RUNTIME_$(2)) \
49+
rt/$(2)/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-
$(2)/rustllvm/$(CFG_RUSTLLVM_$(3)) \
89+
rustllvm/$(2)/$(CFG_RUSTLLVM_$(3)) \
9090
| $$(TLIB$(1)_T_$(2)_H_$(3))/ \
9191
$(SNAPSHOT_RUSTC_POST_CLEANUP)
9292
@$$(call E, cp: $$@)

‎branches/try2/src/compiletest/compiletest.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,8 @@ 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 p = path.pop();
311-
let dir = p.filename();
312-
fmt!("%s/%s", dir.unwrap_or_default(""), filename.unwrap_or_default(""))
310+
let dir = path.pop().filename();
311+
fmt!("%s/%s", dir.unwrap_or_default(~""), filename.unwrap_or_default(~""))
313312
}
314313

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

‎branches/try2/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/try2/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)) != 0
413+
doc_as_u8(self.next_doc(EsBool)) as bool
414414
}
415415

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

‎branches/try2/src/librust/rust.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ fn cmd_help(args: &[~str]) -> ValidUsage {
162162
fn cmd_test(args: &[~str]) -> ValidUsage {
163163
match args {
164164
[ref filename] => {
165-
let p = Path(*filename);
166-
let test_exec = p.filestem().unwrap() + "test~";
165+
let test_exec = Path(*filename).filestem().unwrap() + "test~";
167166
invoke("rustc", &[~"--test", filename.to_owned(),
168167
~"-o", test_exec.to_owned()], rustc::main_args);
169168
let exit_code = run::process_status(~"./" + test_exec, []);
@@ -176,8 +175,7 @@ fn cmd_test(args: &[~str]) -> ValidUsage {
176175
fn cmd_run(args: &[~str]) -> ValidUsage {
177176
match args {
178177
[ref filename, ..prog_args] => {
179-
let p = Path(*filename);
180-
let exec = p.filestem().unwrap() + "~";
178+
let exec = Path(*filename).filestem().unwrap() + "~";
181179
invoke("rustc", &[filename.to_owned(), ~"-o", exec.to_owned()],
182180
rustc::main_args);
183181
let exit_code = run::process_status(~"./"+exec, prog_args);

0 commit comments

Comments
 (0)