Skip to content

Commit 558f420

Browse files
borsbors
committed
---
yaml --- r: 62777 b: refs/heads/snap-stage3 c: 05735a9 h: refs/heads/master i: 62775: b2a526a v: v3
1 parent b1be0b1 commit 558f420

File tree

1,265 files changed

+26260
-29014
lines changed

Some content is hidden

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

1,265 files changed

+26260
-29014
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: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 2505416408910d3ea5919774ae12fe3a32acac9d
4+
refs/heads/snap-stage3: 05735a934a807333f9cbeadd9ef4dc431240bec2
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ src/.DS_Store
7373
/doc/html
7474
/doc/latex
7575
/doc/std
76+
/doc/extra
7677
/nd/
7778
/llvm/
7879
version.md
@@ -81,7 +82,6 @@ keywords.md
8182
x86_64-apple-darwin/
8283
x86_64-unknown-linux-gnu/
8384
i686-unknown-linux-gnu/
84-
doc/core/
8585
tmp.*.rs
8686
config.stamp
8787
.DS_Store

‎branches/snap-stage3/Makefile.in

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ endif
122122
ifdef TRACE
123123
CFG_RUSTC_FLAGS += -Z trace
124124
endif
125+
ifndef DEBUG_BORROWS
126+
RUSTFLAGS_STAGE1 += -Z no-debug-borrows
127+
RUSTFLAGS_STAGE2 += -Z no-debug-borrows
128+
endif
125129

126130
# platform-specific auto-configuration
127131
include $(CFG_SRC_DIR)mk/platform.mk
@@ -201,8 +205,8 @@ define DEF_LIBS
201205

202206
CFG_RUNTIME_$(1) :=$(call CFG_LIB_NAME_$(1),rustrt)
203207
CFG_RUSTLLVM_$(1) :=$(call CFG_LIB_NAME_$(1),rustllvm)
204-
CFG_CORELIB_$(1) :=$(call CFG_LIB_NAME_$(1),core)
205208
CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
209+
CFG_EXTRALIB_$(1) :=$(call CFG_LIB_NAME_$(1),extra)
206210
CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
207211
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
208212
CFG_LIBFUZZER_$(1) :=$(call CFG_LIB_NAME_$(1),fuzzer)
@@ -211,17 +215,17 @@ CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
211215
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
212216
CFG_LIBRUST_$(1) :=$(call CFG_LIB_NAME_$(1),rust)
213217

218+
EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
214219
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
215-
CORELIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),core)
216220
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
217221
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
218222
LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)
219223
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
220224
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
221225
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
222226
LIBRUST_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rust)
227+
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
223228
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
224-
CORELIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),core)
225229
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
226230
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
227231
LIBFUZZER_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),fuzzer)
@@ -236,19 +240,19 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\
236240
$(eval $(call DEF_LIBS,$(target))))
237241

238242
######################################################################
239-
# Core library variables
243+
# Standard library variables
240244
######################################################################
241245

242-
CORELIB_CRATE := $(S)src/libcore/core.rc
243-
CORELIB_INPUTS := $(wildcard $(addprefix $(S)src/libcore/, \
246+
STDLIB_CRATE := $(S)src/libstd/core.rc
247+
STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/, \
244248
core.rc *.rs */*.rs */*/*rs */*/*/*rs))
245249

246250
######################################################################
247-
# Standard library variables
251+
# Extra library variables
248252
######################################################################
249253

250-
STDLIB_CRATE := $(S)src/libstd/std.rc
251-
STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/, \
254+
EXTRALIB_CRATE := $(S)src/libextra/std.rc
255+
EXTRALIB_INPUTS := $(wildcard $(addprefix $(S)src/libextra/, \
252256
std.rc *.rs */*.rs))
253257

254258
######################################################################
@@ -340,33 +344,33 @@ TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustc/$(2)
340344
TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
341345
TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR)
342346

343-
# The name of the core and standard libraries used by rustc
347+
# The name of the standard and extra libraries used by rustc
344348
ifdef CFG_DISABLE_SHAREDSTD
345-
HCORELIB_DEFAULT$(1)_H_$(3) = \
346-
$$(HLIB$(1)_H_$(3))/libcore.rlib
347-
TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
348-
$$(TLIB$(1)_T_$(2)_H_$(3))/libcore.rlib
349-
350349
HSTDLIB_DEFAULT$(1)_H_$(3) = \
351350
$$(HLIB$(1)_H_$(3))/libstd.rlib
352351
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
353352
$$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
354353

354+
HEXTRALIB_DEFAULT$(1)_H_$(3) = \
355+
$$(HLIB$(1)_H_$(3))/libextra.rlib
356+
TEXTRALIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
357+
$$(TLIB$(1)_T_$(2)_H_$(3))/libextra.rlib
358+
355359
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
356360
$$(HLIB$(1)_H_$(3))/librustc.rlib
357361
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
358362
$$(TLIB$(1)_T_$(2)_H_$(3))/librustc.rlib
359363
else
360-
HCORELIB_DEFAULT$(1)_H_$(3) = \
361-
$$(HLIB$(1)_H_$(3))/$(CFG_CORELIB_$(3))
362-
TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
363-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2))
364-
365364
HSTDLIB_DEFAULT$(1)_H_$(3) = \
366365
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB_$(3))
367366
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
368367
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
369368

369+
HEXTRALIB_DEFAULT$(1)_H_$(3) = \
370+
$$(HLIB$(1)_H_$(3))/$(CFG_EXTRALIB_$(3))
371+
TEXTRALIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
372+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
373+
370374
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
371375
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
372376
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
@@ -378,8 +382,8 @@ HSREQ$(1)_H_$(3) = \
378382
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
379383
$$(HLIB$(1)_H_$(3))/$(CFG_RUNTIME_$(3)) \
380384
$$(HLIB$(1)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
381-
$$(HCORELIB_DEFAULT$(1)_H_$(3)) \
382385
$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
386+
$$(HEXTRALIB_DEFAULT$(1)_H_$(3)) \
383387
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \
384388
$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
385389
$$(MKFILE_DEPS)
@@ -393,8 +397,8 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
393397
# Prerequisites for a working stageN compiler and libraries, for a specific target
394398
SREQ$(1)_T_$(2)_H_$(3) = \
395399
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
396-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
397-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
400+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
401+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
398402

399403
# Prerequisites for a working stageN compiler and libraries, for a specific target
400404
CSREQ$(1)_T_$(2)_H_$(3) = \
@@ -409,8 +413,8 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
409413
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
410414
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
411415
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUST_$(3)) \
412-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
413-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
416+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
417+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
414418
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
415419
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
416420
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2)) \

‎branches/snap-stage3/configure

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -555,11 +555,11 @@ then
555555
CFG_CLANG_VERSION=$("$CFG_CLANG" \
556556
--version \
557557
| grep version \
558-
| sed 's/.*\(version .*\)/\1/' \
558+
| sed 's/.*\(version .*\)/\1/; s/.*based on \(LLVM .*\))/\1/' \
559559
| cut -d ' ' -f 2)
560560

561561
case $CFG_CLANG_VERSION in
562-
(3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 4.0* | 4.1* | 4.2*)
562+
(3.0svn | 3.0 | 3.1* | 3.2* | 3.3*)
563563
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
564564
CFG_C_COMPILER="clang"
565565
;;
@@ -643,7 +643,7 @@ fi
643643
step_msg "making directories"
644644

645645
for i in \
646-
doc doc/core doc/std \
646+
doc doc/std doc/extra \
647647
dl tmp
648648
do
649649
make_dir $i
@@ -665,12 +665,16 @@ make_dir rt
665665
for t in $CFG_TARGET_TRIPLES
666666
do
667667
make_dir rt/$t
668-
for i in \
669-
isaac linenoise sync test \
670-
arch/i386 arch/x86_64 arch/arm arch/mips \
671-
libuv libuv/src/ares libuv/src/eio libuv/src/ev
668+
for s in 0 1 2 3
672669
do
673-
make_dir rt/$t/$i
670+
make_dir rt/$t/stage$s
671+
for i in \
672+
isaac linenoise sync test \
673+
arch/i386 arch/x86_64 arch/arm arch/mips \
674+
libuv libuv/src/ares libuv/src/eio libuv/src/ev
675+
do
676+
make_dir rt/$t/stage$s/$i
677+
done
674678
done
675679
done
676680

0 commit comments

Comments
 (0)