Skip to content

Commit b14785d

Browse files
sanxiynsanxiyn
authored
Merge branch 'master' into sparc64
2 parents 728ec85 + 07412c8 commit b14785d

File tree

197 files changed

+4826
-2396
lines changed

Some content is hidden

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

197 files changed

+4826
-2396
lines changed

‎.travis.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ matrix:
1919
- env: IMAGE=i686-gnu-nopt
2020
- env: IMAGE=x86_64-freebsd
2121
- env: IMAGE=x86_64-gnu
22-
- env: IMAGE=x86_64-gnu-cargotest
22+
- env: IMAGE=x86_64-gnu-full-bootstrap
23+
- env: IMAGE=x86_64-gnu-aux
2324
- env: IMAGE=x86_64-gnu-debug
2425
- env: IMAGE=x86_64-gnu-nopt
2526
- env: IMAGE=x86_64-gnu-make
2627
- env: IMAGE=x86_64-gnu-llvm-3.7 ALLOW_PR=1 RUST_BACKTRACE=1
2728
- env: IMAGE=x86_64-musl
29+
- env: IMAGE=x86_64-gnu-distcheck
2830

2931
# OSX builders
3032
- env: >
@@ -66,10 +68,10 @@ script:
6668
if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then
6769
echo skipping, not a full build;
6870
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
69-
git submodule update --init;
71+
git submodule update --init &&
7072
src/ci/run.sh;
7173
else
72-
git submodule update --init;
74+
git submodule update --init &&
7375
src/ci/docker/run.sh $IMAGE;
7476
fi
7577
@@ -78,7 +80,7 @@ before_cache:
7880
- docker history -q rust-ci |
7981
grep -v missing |
8082
xargs docker save |
81-
gzip -9 > $HOME/docker/rust-ci.tar.gz
83+
gzip > $HOME/docker/rust-ci.tar.gz
8284
before_install:
8385
- zcat $HOME/docker/rust-ci.tar.gz | docker load || true
8486

‎README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ build.
8282
# Install build tools needed for Rust. If you're building a 32-bit compiler,
8383
# then replace "x86_64" below with "i686". If you've already got git, python,
8484
# or CMake installed and in PATH you can remove them from this list. Note
85-
# that it is important that the `python2` and `cmake` packages **not** used.
86-
# The build has historically been known to fail with these packages.
85+
# that it is important that you do **not** use the 'python2' and 'cmake'
86+
# packages from the 'msys2' subsystem. The build has historically been known
87+
# to fail with these packages.
8788
$ pacman -S git \
8889
make \
8990
diffutils \

‎appveyor.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ environment:
2121
# MSVC cargotest
2222
- MSYS_BITS: 64
2323
NO_VENDOR: 1
24-
RUST_CHECK_TARGET: check-cargotest
24+
RUST_CHECK_TARGET: check-aux
2525
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
2626

2727
# 32/64-bit MinGW builds.
@@ -96,6 +96,13 @@ install:
9696
- 7z x -y sccache.tar > nul
9797
- set PATH=%PATH%;%CD%\sccache2
9898

99+
# Help debug some handle issues on AppVeyor
100+
- ps: Invoke-WebRequest -Uri https://download.sysinternals.com/files/Handle.zip -OutFile handle.zip
101+
- mkdir handle
102+
- ps: Expand-Archive handle.zip -dest handle
103+
- set PATH=%PATH%;%CD%\handle
104+
- handle.exe -accepteula -help
105+
99106
test_script:
100107
- git submodule update --init
101108
- set SRC=.

‎configure

+1
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,7 @@ opt_nosave manage-submodules 1 "let the build manage the git submodules"
693693
opt_nosave clang 0 "prefer clang to gcc for building the runtime"
694694
opt_nosave jemalloc 1 "build liballoc with jemalloc"
695695
opt elf-tls 1 "elf thread local storage on platforms where supported"
696+
opt full-bootstrap 0 "build three compilers instead of two"
696697

697698
valopt_nosave prefix "/usr/local" "set installation prefix"
698699
valopt_nosave local-rust-root "/usr/local" "set prefix for local rust binary"

‎mk/crates.mk

+15-10
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ TARGET_CRATES := libc std term \
5454
compiler_builtins core alloc \
5555
std_unicode rustc_bitflags \
5656
alloc_system alloc_jemalloc \
57-
panic_abort panic_unwind unwind
57+
panic_abort panic_unwind unwind rustc_i128
5858
RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_driver \
5959
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
6060
rustc_data_structures rustc_platform_intrinsics rustc_errors \
@@ -92,23 +92,26 @@ DEPS_getopts := std
9292
DEPS_graphviz := std
9393
DEPS_log := std
9494
DEPS_num := std
95-
DEPS_serialize := std log
95+
DEPS_serialize := std log rustc_i128
9696
DEPS_term := std
9797
DEPS_test := std getopts term native:rust_test_helpers
98+
DEPS_rustc_i128 = std
9899

99-
DEPS_syntax := std term serialize log arena libc rustc_bitflags std_unicode rustc_errors syntax_pos rustc_data_structures
100+
DEPS_syntax := std term serialize log arena libc rustc_bitflags std_unicode rustc_errors \
101+
syntax_pos rustc_data_structures rustc_i128
100102
DEPS_syntax_ext := syntax syntax_pos rustc_errors fmt_macros proc_macro
103+
DEPS_proc_macro := syntax syntax_pos rustc_plugin log
101104
DEPS_syntax_pos := serialize
102105
DEPS_proc_macro_tokens := syntax syntax_pos log
103106
DEPS_proc_macro_plugin := syntax syntax_pos rustc_plugin log proc_macro_tokens
104107

105-
DEPS_rustc_const_math := std syntax log serialize
108+
DEPS_rustc_const_math := std syntax log serialize rustc_i128
106109
DEPS_rustc_const_eval := rustc_const_math rustc syntax log serialize \
107-
rustc_back graphviz syntax_pos
110+
rustc_back graphviz syntax_pos rustc_i128
108111

109112
DEPS_rustc := syntax fmt_macros flate arena serialize getopts \
110113
log graphviz rustc_llvm rustc_back rustc_data_structures\
111-
rustc_const_math syntax_pos rustc_errors
114+
rustc_const_math syntax_pos rustc_errors rustc_i128
112115
DEPS_rustc_back := std syntax flate log libc
113116
DEPS_rustc_borrowck := rustc log graphviz syntax syntax_pos rustc_errors rustc_mir
114117
DEPS_rustc_data_structures := std log serialize libc
@@ -119,19 +122,20 @@ DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_bo
119122
rustc_passes rustc_save_analysis rustc_const_eval \
120123
rustc_incremental syntax_pos rustc_errors proc_macro rustc_data_structures
121124
DEPS_rustc_errors := log libc serialize syntax_pos
122-
DEPS_rustc_lint := rustc log syntax syntax_pos rustc_const_eval
125+
DEPS_rustc_lint := rustc log syntax syntax_pos rustc_const_eval rustc_i128
123126
DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
124127
DEPS_proc_macro := std syntax
125128
DEPS_rustc_metadata := rustc syntax syntax_pos rustc_errors rustc_const_math \
126-
proc_macro syntax_ext
129+
proc_macro syntax_ext rustc_i128
127130
DEPS_rustc_passes := syntax syntax_pos rustc core rustc_const_eval rustc_errors
128-
DEPS_rustc_mir := rustc syntax syntax_pos rustc_const_math rustc_const_eval rustc_bitflags
131+
DEPS_rustc_mir := rustc syntax syntax_pos rustc_const_math rustc_const_eval rustc_bitflags \
132+
rustc_i128
129133
DEPS_rustc_resolve := arena rustc log syntax syntax_pos rustc_errors
130134
DEPS_rustc_platform_intrinsics := std
131135
DEPS_rustc_plugin := rustc rustc_metadata syntax syntax_pos rustc_errors
132136
DEPS_rustc_privacy := rustc log syntax syntax_pos
133137
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
134-
log syntax serialize rustc_llvm rustc_platform_intrinsics \
138+
log syntax serialize rustc_llvm rustc_platform_intrinsics rustc_i128 \
135139
rustc_const_math rustc_const_eval rustc_incremental rustc_errors syntax_pos
136140
DEPS_rustc_incremental := rustc syntax_pos serialize rustc_data_structures
137141
DEPS_rustc_save_analysis := rustc log syntax syntax_pos serialize
@@ -159,6 +163,7 @@ ONLY_RLIB_alloc := 1
159163
ONLY_RLIB_rand := 1
160164
ONLY_RLIB_collections := 1
161165
ONLY_RLIB_std_unicode := 1
166+
ONLY_RLIB_rustc_i128 := 1
162167
ONLY_RLIB_rustc_bitflags := 1
163168
ONLY_RLIB_alloc_system := 1
164169
ONLY_RLIB_alloc_jemalloc := 1

‎src/Cargo.lock

+16-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/bootstrap/bin/rustc.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ fn main() {
8989
// When we build Rust dylibs they're all intended for intermediate
9090
// usage, so make sure we pass the -Cprefer-dynamic flag instead of
9191
// linking all deps statically into the dylib.
92-
cmd.arg("-Cprefer-dynamic");
92+
if env::var_os("RUSTC_NO_PREFER_DYNAMIC").is_none() {
93+
cmd.arg("-Cprefer-dynamic");
94+
}
9395

9496
// Help the libc crate compile by assisting it in finding the MUSL
9597
// native libraries.

0 commit comments

Comments
 (0)