Skip to content

Commit f104549

Browse files
author
Caitlin Potter
committed
---
yaml --- r: 65418 b: refs/heads/master c: bfe141c h: refs/heads/master v: v3
1 parent c6b83c8 commit f104549

File tree

1,470 files changed

+31936
-32324
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,470 files changed

+31936
-32324
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 5fa788415fc5f7976e314ac2024f84f6e0196f98
2+
refs/heads/master: bfe141c4e1a8c19072f4c3e0ea5450961253617b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

‎trunk/.gitignore

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

‎trunk/Makefile.in

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ 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
129125

130126
# platform-specific auto-configuration
131127
include $(CFG_SRC_DIR)mk/platform.mk
@@ -205,8 +201,8 @@ define DEF_LIBS
205201

206202
CFG_RUNTIME_$(1) :=$(call CFG_LIB_NAME_$(1),rustrt)
207203
CFG_RUSTLLVM_$(1) :=$(call CFG_LIB_NAME_$(1),rustllvm)
204+
CFG_CORELIB_$(1) :=$(call CFG_LIB_NAME_$(1),core)
208205
CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
209-
CFG_EXTRALIB_$(1) :=$(call CFG_LIB_NAME_$(1),extra)
210206
CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
211207
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
212208
CFG_LIBFUZZER_$(1) :=$(call CFG_LIB_NAME_$(1),fuzzer)
@@ -215,17 +211,17 @@ CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
215211
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
216212
CFG_LIBRUST_$(1) :=$(call CFG_LIB_NAME_$(1),rust)
217213

218-
EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
219214
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
215+
CORELIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),core)
220216
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
221217
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
222218
LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)
223219
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
224220
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
225221
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
226222
LIBRUST_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rust)
227-
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
228223
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
224+
CORELIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),core)
229225
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
230226
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
231227
LIBFUZZER_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),fuzzer)
@@ -240,19 +236,19 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\
240236
$(eval $(call DEF_LIBS,$(target))))
241237

242238
######################################################################
243-
# Standard library variables
239+
# Core library variables
244240
######################################################################
245241

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

250246
######################################################################
251-
# Extra library variables
247+
# Standard library variables
252248
######################################################################
253249

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

258254
######################################################################
@@ -275,7 +271,7 @@ DRIVER_CRATE := $(S)src/driver/driver.rs
275271

276272
# FIXME: x86-ism
277273
LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit \
278-
interpreter instrumentation
274+
interpreter
279275

280276
define DEF_LLVM_VARS
281277
# The configure script defines these variables with the target triples
@@ -344,33 +340,33 @@ TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustc/$(2)
344340
TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
345341
TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR)
346342

347-
# The name of the standard and extra libraries used by rustc
343+
# The name of the core and standard libraries used by rustc
348344
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+
349350
HSTDLIB_DEFAULT$(1)_H_$(3) = \
350351
$$(HLIB$(1)_H_$(3))/libstd.rlib
351352
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
352353
$$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
353354

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-
359355
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
360356
$$(HLIB$(1)_H_$(3))/librustc.rlib
361357
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
362358
$$(TLIB$(1)_T_$(2)_H_$(3))/librustc.rlib
363359
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+
364365
HSTDLIB_DEFAULT$(1)_H_$(3) = \
365366
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB_$(3))
366367
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
367368
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
368369

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-
374370
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
375371
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
376372
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
@@ -382,8 +378,8 @@ HSREQ$(1)_H_$(3) = \
382378
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
383379
$$(HLIB$(1)_H_$(3))/$(CFG_RUNTIME_$(3)) \
384380
$$(HLIB$(1)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
381+
$$(HCORELIB_DEFAULT$(1)_H_$(3)) \
385382
$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
386-
$$(HEXTRALIB_DEFAULT$(1)_H_$(3)) \
387383
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \
388384
$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
389385
$$(MKFILE_DEPS)
@@ -397,8 +393,8 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
397393
# Prerequisites for a working stageN compiler and libraries, for a specific target
398394
SREQ$(1)_T_$(2)_H_$(3) = \
399395
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
400-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
401-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
396+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
397+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
402398

403399
# Prerequisites for a working stageN compiler and libraries, for a specific target
404400
CSREQ$(1)_T_$(2)_H_$(3) = \
@@ -413,8 +409,8 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
413409
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
414410
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
415411
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUST_$(3)) \
416-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
417-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
412+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
413+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
418414
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
419415
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
420416
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2)) \

‎trunk/configure

Lines changed: 12 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
376376
opt manage-submodules 1 "let the build manage the git submodules"
377377
opt mingw-cross 0 "cross-compile for win32 using mingw"
378378
opt clang 0 "prefer clang to gcc for building the runtime"
379-
opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
380379
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
381380
opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-patched kernels)"
382381
valopt prefix "/usr/local" "set installation prefix"
@@ -422,7 +421,6 @@ else
422421
fi
423422

424423
probe CFG_CLANG clang++
425-
probe CFG_CCACHE ccache
426424
probe CFG_GCC gcc
427425
probe CFG_LD ld
428426
probe CFG_VALGRIND valgrind
@@ -557,11 +555,11 @@ then
557555
CFG_CLANG_VERSION=$("$CFG_CLANG" \
558556
--version \
559557
| grep version \
560-
| sed 's/.*\(version .*\)/\1/; s/.*based on \(LLVM .*\))/\1/' \
558+
| sed 's/.*\(version .*\)/\1/' \
561559
| cut -d ' ' -f 2)
562560

563561
case $CFG_CLANG_VERSION in
564-
(3.0svn | 3.0 | 3.1* | 3.2* | 3.3*)
562+
(3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 4.0* | 4.1* | 4.2*)
565563
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
566564
CFG_C_COMPILER="clang"
567565
;;
@@ -573,16 +571,6 @@ else
573571
CFG_C_COMPILER="gcc"
574572
fi
575573

576-
if [ ! -z "$CFG_ENABLE_CCACHE" ]
577-
then
578-
if [ -z "$CFG_CCACHE" ]
579-
then
580-
err "ccache requested but not found"
581-
fi
582-
583-
CFG_C_COMPILER="ccache $CFG_C_COMPILER"
584-
fi
585-
586574
# a little post-processing of various config values
587575

588576
CFG_PREFIX=${CFG_PREFIX%/}
@@ -655,7 +643,7 @@ fi
655643
step_msg "making directories"
656644

657645
for i in \
658-
doc doc/std doc/extra \
646+
doc doc/core doc/std \
659647
dl tmp
660648
do
661649
make_dir $i
@@ -677,16 +665,12 @@ make_dir rt
677665
for t in $CFG_TARGET_TRIPLES
678666
do
679667
make_dir rt/$t
680-
for s in 0 1 2 3
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
681672
do
682-
make_dir rt/$t/stage$s
683-
for i in \
684-
isaac linenoise sync test \
685-
arch/i386 arch/x86_64 arch/arm arch/mips \
686-
libuv libuv/src/ares libuv/src/eio libuv/src/ev
687-
do
688-
make_dir rt/$t/stage$s/$i
689-
done
673+
make_dir rt/$t/$i
690674
done
691675
done
692676

@@ -837,35 +821,20 @@ do
837821
--enable-bindings=none --disable-threads \
838822
--disable-pthreads"
839823

840-
case "$CFG_C_COMPILER" in
841-
("ccache clang")
842-
LLVM_CXX_32="ccache clang++ -m32 -Qunused-arguments"
843-
LLVM_CC_32="ccache clang -m32 -Qunused-arguments"
844-
845-
LLVM_CXX_64="ccache clang++ -Qunused-arguments"
846-
LLVM_CC_64="ccache clang -Qunused-arguments"
847-
;;
848-
("clang")
824+
if [ "$CFG_C_COMPILER" = "clang" ]
825+
then
849826
LLVM_CXX_32="clang++ -m32"
850827
LLVM_CC_32="clang -m32"
851828

852829
LLVM_CXX_64="clang++"
853830
LLVM_CC_64="clang"
854-
;;
855-
("ccache gcc")
856-
LLVM_CXX_32="ccache g++ -m32"
857-
LLVM_CC_32="ccache gcc -m32"
858-
859-
LLVM_CXX_64="ccache g++"
860-
LLVM_CC_64="ccache gcc"
861-
;;
862-
("gcc")
831+
else
863832
LLVM_CXX_32="g++ -m32"
864833
LLVM_CC_32="gcc -m32"
865834

866835
LLVM_CXX_64="g++"
867836
LLVM_CC_64="gcc"
868-
esac
837+
fi
869838

870839
LLVM_CFLAGS_32="-m32"
871840
LLVM_CXXFLAGS_32="-m32"
@@ -962,14 +931,6 @@ then
962931
putvar CFG_PAXCTL
963932
fi
964933

965-
# Avoid spurious warnings from clang by feeding it original source on
966-
# ccache-miss rather than preprocessed input.
967-
if [ ! -z "$CFG_ENABLE_CCACHE" ] && [ ! -z "$CFG_ENABLE_CLANG" ]
968-
then
969-
CFG_CCACHE_CPP2=1
970-
putvar CFG_CCACHE_CPP2
971-
fi
972-
973934
if [ ! -z $BAD_PANDOC ]
974935
then
975936
CFG_PANDOC=

0 commit comments

Comments
 (0)