From 7ac017d8f3d54b98ae67d6fa4fbe3ead25dcd63d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 9 Oct 2017 17:54:49 -0700
Subject: [PATCH 01/10] Prepare the 1.22.0 beta
This updates the Cargo submodule a bit but is otherwise pretty routine.
---
src/Cargo.lock | 42 ++++++++++++++++++++++++++++++++++++------
src/bootstrap/check.rs | 8 ++++++--
src/ci/run.sh | 2 +-
src/stage0.txt | 6 +++---
src/tools/cargo | 2 +-
5 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/src/Cargo.lock b/src/Cargo.lock
index 77e33855f2344..443a7f7d7b6c9 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -1,7 +1,3 @@
-[root]
-name = "workspace_symbol"
-version = "0.1.0"
-
[[package]]
name = "advapi32-sys"
version = "0.2.0"
@@ -178,13 +174,13 @@ dependencies = [
name = "cargo"
version = "0.23.0"
dependencies = [
- "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"cargotest 0.1.0",
"core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"crates-io 0.12.0",
"crossbeam 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crypto-hash 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -206,7 +202,6 @@ dependencies = [
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
"psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -286,6 +281,22 @@ dependencies = [
"core 0.0.0",
]
+[[package]]
+name = "commoncrypto"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "commoncrypto-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "compiler_builtins"
version = "0.0.0"
@@ -365,6 +376,18 @@ name = "crossbeam"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "crypto-hash"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "cssparser"
version = "0.13.7"
@@ -2441,6 +2464,10 @@ dependencies = [
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "workspace_symbol"
+version = "0.1.0"
+
[[package]]
name = "ws2_32-sys"
version = "0.2.1"
@@ -2489,11 +2516,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
"checksum clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3451e409013178663435d6f15fdb212f14ee4424a3d74f979d081d0a66b6f1f2"
"checksum cmake 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "357c07e7a1fc95732793c1edb5901e1a1f305cfcf63a90eb12dbd22bdb6b789d"
+"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
+"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
"checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
"checksum core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5909502e547762013619f4c4e01cc7393c20fe2d52d7fa471c1210adb2320dc7"
"checksum core-foundation-sys 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bc9fb3d6cb663e6fd7cf1c63f9b144ee2b1e4a78595a0451dd34bff85b9a3387"
"checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
"checksum crossbeam 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8837ab96533202c5b610ed44bc7f4183e7957c1c8f56e8cc78bb098593c8ba0a"
+"checksum crypto-hash 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34903878eec1694faf53cae8473a088df333181de421d4d3d48061d6559fe602"
"checksum cssparser 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef6124306e5ebc5ab11891d063aeafdd0cdc308079b708c8b566125f3680292b"
"checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"
"checksum curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7034c534a1d7d22f7971d6088aa9d281d219ef724026c3428092500f41ae9c2c"
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 6e276f44668f7..bd9d29be96fdc 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -246,13 +246,17 @@ impl Step for Rls {
let compiler = builder.compiler(stage, host);
builder.ensure(tool::Rls { compiler, target: self.host });
- let mut cargo = builder.cargo(compiler, Mode::Tool, host, "test");
- cargo.arg("--manifest-path").arg(build.src.join("src/tools/rls/Cargo.toml"));
+ let mut cargo = tool::prepare_tool_cargo(builder,
+ compiler,
+ host,
+ "test",
+ "src/tools/rls");
// Don't build tests dynamically, just a pain to work with
cargo.env("RUSTC_NO_PREFER_DYNAMIC", "1");
builder.add_rustc_lib_path(compiler, &mut cargo);
+ cargo.arg("--").args(&build.config.cmd.test_args());
try_run_expecting(
build,
diff --git a/src/ci/run.sh b/src/ci/run.sh
index b4fa033c4a668..1d180f834f57e 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -43,7 +43,7 @@ fi
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
# either automatically or manually.
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
- RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=nightly"
+ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=beta"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
diff --git a/src/stage0.txt b/src/stage0.txt
index 892679c192916..99150eaaaad1e 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -12,9 +12,9 @@
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
# `0.x.0` for Cargo where they were released on `date`.
-date: 2017-08-29
-rustc: beta
-cargo: beta
+date: 2017-10-12
+rustc: 1.21.0
+cargo: 0.22.0
# When making a stable release the process currently looks like:
#
diff --git a/src/tools/cargo b/src/tools/cargo
index e447ac7e94b7f..463e850146e94 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit e447ac7e94b7f56ab13e361f9e324dafe3eb0a34
+Subproject commit 463e850146e9454b8b953ff73772a35b286b58e7
From 07117cff068dc90cbf96a0213dca3fe05fc3e242 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 10 Oct 2017 18:59:40 -0700
Subject: [PATCH 02/10] ci: Fix installing the Android SDK
Apparently the https urls are broken due to some certificate validation
whatnots, and so far the least intrusive solution I've found is to just disable
that.
---
src/ci/docker/scripts/android-sdk.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ci/docker/scripts/android-sdk.sh b/src/ci/docker/scripts/android-sdk.sh
index d343aae9dfb68..3aa2b9d58d57a 100644
--- a/src/ci/docker/scripts/android-sdk.sh
+++ b/src/ci/docker/scripts/android-sdk.sh
@@ -31,7 +31,7 @@ download_sysimage() {
# Keep printing yes to accept the licenses
while true; do echo yes; sleep 10; done | \
/android/sdk/tools/android update sdk -a --no-ui \
- --filter "$filter"
+ --filter "$filter" --no-https
}
create_avd() {
From 85f61391849a253d33a5328a788ee5fac80f7e4b Mon Sep 17 00:00:00 2001
From: bgermann <bgermann@users.noreply.github.com>
Date: Fri, 13 Oct 2017 11:36:44 +0200
Subject: [PATCH 03/10] Make Solaris builder compatible with Solaris 10
---
src/ci/docker/cross2/Dockerfile | 12 +++++-----
.../docker/cross2/build-solaris-toolchain.sh | 22 +++++++++++--------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/ci/docker/cross2/Dockerfile b/src/ci/docker/cross2/Dockerfile
index f5fc06767ce90..029d2c18d4a4c 100644
--- a/src/ci/docker/cross2/Dockerfile
+++ b/src/ci/docker/cross2/Dockerfile
@@ -36,12 +36,12 @@ ENV \
AR_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-ar \
CC_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang \
CXX_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang++ \
- AR_sparcv9_sun_solaris=sparcv9-sun-solaris2.11-ar \
- CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.11-gcc \
- CXX_sparcv9_sun_solaris=sparcv9-sun-solaris2.11-g++ \
- AR_x86_64_sun_solaris=x86_64-sun-solaris2.11-ar \
- CC_x86_64_sun_solaris=x86_64-sun-solaris2.11-gcc \
- CXX_x86_64_sun_solaris=x86_64-sun-solaris2.11-g++
+ AR_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-ar \
+ CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-gcc \
+ CXX_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-g++ \
+ AR_x86_64_sun_solaris=x86_64-sun-solaris2.10-ar \
+ CC_x86_64_sun_solaris=x86_64-sun-solaris2.10-gcc \
+ CXX_x86_64_sun_solaris=x86_64-sun-solaris2.10-g++
ENV TARGETS=x86_64-unknown-fuchsia
ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia
diff --git a/src/ci/docker/cross2/build-solaris-toolchain.sh b/src/ci/docker/cross2/build-solaris-toolchain.sh
index ae84cc62b6086..935cbe5d61b58 100755
--- a/src/ci/docker/cross2/build-solaris-toolchain.sh
+++ b/src/ci/docker/cross2/build-solaris-toolchain.sh
@@ -25,7 +25,7 @@ cd binutils
curl https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS.tar.xz | tar xJf -
mkdir binutils-build
cd binutils-build
-hide_output ../binutils-$BINUTILS/configure --target=$ARCH-sun-solaris2.11
+hide_output ../binutils-$BINUTILS/configure --target=$ARCH-sun-solaris2.10
hide_output make -j10
hide_output make install
@@ -58,13 +58,17 @@ for deb in *$APT_ARCH.deb; do
dpkg -x $deb .
done
-mkdir /usr/local/$ARCH-sun-solaris2.11/usr
-mv usr/include /usr/local/$ARCH-sun-solaris2.11/usr/include
-mv usr/lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.11/lib
-mv lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.11/lib
+# Strip Solaris 11 functions that are optionally used by libbacktrace.
+# This is for Solaris 10 compatibility.
+$ARCH-sun-solaris2.10-strip -N dl_iterate_phdr -N strnlen lib/$LIB_ARCH/libc.so
-ln -s /usr/local/$ARCH-sun-solaris2.11/usr/include /usr/local/$ARCH-sun-solaris2.11/sys-include
-ln -s /usr/local/$ARCH-sun-solaris2.11/usr/include /usr/local/$ARCH-sun-solaris2.11/include
+mkdir /usr/local/$ARCH-sun-solaris2.10/usr
+mv usr/include /usr/local/$ARCH-sun-solaris2.10/usr/include
+mv usr/lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib
+mv lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib
+
+ln -s /usr/local/$ARCH-sun-solaris2.10/usr/include /usr/local/$ARCH-sun-solaris2.10/sys-include
+ln -s /usr/local/$ARCH-sun-solaris2.10/usr/include /usr/local/$ARCH-sun-solaris2.10/include
cd ..
rm -rf solaris
@@ -80,7 +84,7 @@ mkdir ../gcc-build
cd ../gcc-build
hide_output ../gcc-$GCC/configure \
--enable-languages=c,c++ \
- --target=$ARCH-sun-solaris2.11 \
+ --target=$ARCH-sun-solaris2.10 \
--with-gnu-as \
--with-gnu-ld \
--disable-multilib \
@@ -94,7 +98,7 @@ hide_output ../gcc-$GCC/configure \
--disable-libsanitizer \
--disable-libquadmath-support \
--disable-lto \
- --with-sysroot=/usr/local/$ARCH-sun-solaris2.11
+ --with-sysroot=/usr/local/$ARCH-sun-solaris2.10
hide_output make -j10
hide_output make install
From 13f66d3bfbc284ec1b48b172306d82ac99c61828 Mon Sep 17 00:00:00 2001
From: Michael Woerister <michaelwoerister@posteo>
Date: Tue, 10 Oct 2017 17:08:29 +0200
Subject: [PATCH 04/10] incr.comp.: Add missing match branch in HashStable impl
for ty::RegionKind.
---
src/librustc/ich/impls_ty.rs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
index fe060aaf4269e..582c4e13a82ca 100644
--- a/src/librustc/ich/impls_ty.rs
+++ b/src/librustc/ich/impls_ty.rs
@@ -61,6 +61,9 @@ for ty::RegionKind {
def_id.hash_stable(hcx, hasher);
name.hash_stable(hcx, hasher);
}
+ ty::ReLateBound(db, ty::BrEnv) => {
+ db.depth.hash_stable(hcx, hasher);
+ }
ty::ReEarlyBound(ty::EarlyBoundRegion { def_id, index, name }) => {
def_id.hash_stable(hcx, hasher);
index.hash_stable(hcx, hasher);
From 97e6a3770e848b5908441d1b5beced9e19f7bada Mon Sep 17 00:00:00 2001
From: Michael Woerister <michaelwoerister@posteo>
Date: Tue, 10 Oct 2017 17:11:08 +0200
Subject: [PATCH 05/10] incr.comp.: Fix instability in
CodegenUnitExt::items_in_deterministic_order().
---
src/librustc_trans/partitioning.rs | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/librustc_trans/partitioning.rs b/src/librustc_trans/partitioning.rs
index 0d46ea64f9f7f..386806e4c9c9f 100644
--- a/src/librustc_trans/partitioning.rs
+++ b/src/librustc_trans/partitioning.rs
@@ -163,10 +163,27 @@ pub trait CodegenUnitExt<'tcx> {
fn item_sort_key<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
item: TransItem<'tcx>) -> ItemSortKey {
ItemSortKey(match item {
- TransItem::Fn(instance) => {
- tcx.hir.as_local_node_id(instance.def_id())
+ TransItem::Fn(ref instance) => {
+ match instance.def {
+ // We only want to take NodeIds of user-defined
+ // instances into account. The others don't matter for
+ // the codegen tests and can even make item order
+ // unstable.
+ InstanceDef::Item(def_id) => {
+ tcx.hir.as_local_node_id(def_id)
+ }
+ InstanceDef::Intrinsic(..) |
+ InstanceDef::FnPtrShim(..) |
+ InstanceDef::Virtual(..) |
+ InstanceDef::ClosureOnceShim { .. } |
+ InstanceDef::DropGlue(..) |
+ InstanceDef::CloneShim(..) => {
+ None
+ }
+ }
}
- TransItem::Static(node_id) | TransItem::GlobalAsm(node_id) => {
+ TransItem::Static(node_id) |
+ TransItem::GlobalAsm(node_id) => {
Some(node_id)
}
}, item.symbol_name(tcx))
From 9800508d61bcd97d9aadd8be51ba41e58f40d800 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 20 Oct 2017 07:54:39 -0700
Subject: [PATCH 06/10] Bump the beta to .2
---
src/bootstrap/channel.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
index 6ed504dfe74a3..79874a57d89e1 100644
--- a/src/bootstrap/channel.rs
+++ b/src/bootstrap/channel.rs
@@ -29,7 +29,7 @@ pub const CFG_RELEASE_NUM: &str = "1.22.0";
// An optional number to put after the label, e.g. '.2' -> '-beta.2'
// Be sure to make this starts with a dot to conform to semver pre-release
// versions (section 9)
-pub const CFG_PRERELEASE_VERSION: &str = ".1";
+pub const CFG_PRERELEASE_VERSION: &str = ".2";
pub struct GitInfo {
inner: Option<Info>,
From 1dfc8d2aa2c1e30dc99ce843c64a0eb5c35e991e Mon Sep 17 00:00:00 2001
From: bgermann <bgermann@users.noreply.github.com>
Date: Tue, 17 Oct 2017 15:53:18 +0200
Subject: [PATCH 07/10] Make Solaris builder compatible with Solaris 10 retry
Unfortunately, #45255 does not quite cut it,
so use a different approach to have Solaris 10 compatibility
by tricking libbacktrace's autoconf tests.
The sysroot download routine is slightly changed, too.
(cherry picked from commit b3ea6e5fc548fd03f1902f9abfe4e3f11d426d39)
---
.../docker/cross2/build-solaris-toolchain.sh | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/ci/docker/cross2/build-solaris-toolchain.sh b/src/ci/docker/cross2/build-solaris-toolchain.sh
index 935cbe5d61b58..29d1d4414f2dd 100755
--- a/src/ci/docker/cross2/build-solaris-toolchain.sh
+++ b/src/ci/docker/cross2/build-solaris-toolchain.sh
@@ -38,37 +38,38 @@ cd solaris
dpkg --add-architecture $APT_ARCH
apt-get update
-apt-get download \
- libc:$APT_ARCH \
+apt-get download $(apt-cache depends --recurse --no-replaces \
libc-dev:$APT_ARCH \
- libm:$APT_ARCH \
libm-dev:$APT_ARCH \
- libpthread:$APT_ARCH \
libpthread-dev:$APT_ARCH \
- libresolv:$APT_ARCH \
libresolv-dev:$APT_ARCH \
- librt:$APT_ARCH \
librt-dev:$APT_ARCH \
- libsocket:$APT_ARCH \
libsocket-dev:$APT_ARCH \
system-crt:$APT_ARCH \
- system-header:$APT_ARCH
+ system-header:$APT_ARCH \
+ | grep "^\w")
for deb in *$APT_ARCH.deb; do
dpkg -x $deb .
done
-# Strip Solaris 11 functions that are optionally used by libbacktrace.
+# Remove Solaris 11 functions that are optionally used by libbacktrace.
# This is for Solaris 10 compatibility.
-$ARCH-sun-solaris2.10-strip -N dl_iterate_phdr -N strnlen lib/$LIB_ARCH/libc.so
+rm usr/include/link.h
+patch -p0 << 'EOF'
+--- usr/include/string.h 2017-10-09 03:15:04.000000000 +0200
++++ usr/include/string10.h 2017-10-16 11:27:26.498764422 +0200
+@@ -93 +92,0 @@
+-extern size_t strnlen(const char *, size_t);
+EOF
mkdir /usr/local/$ARCH-sun-solaris2.10/usr
mv usr/include /usr/local/$ARCH-sun-solaris2.10/usr/include
mv usr/lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib
mv lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib
-ln -s /usr/local/$ARCH-sun-solaris2.10/usr/include /usr/local/$ARCH-sun-solaris2.10/sys-include
-ln -s /usr/local/$ARCH-sun-solaris2.10/usr/include /usr/local/$ARCH-sun-solaris2.10/include
+ln -s usr/include /usr/local/$ARCH-sun-solaris2.10/sys-include
+ln -s usr/include /usr/local/$ARCH-sun-solaris2.10/include
cd ..
rm -rf solaris
@@ -97,8 +98,7 @@ hide_output ../gcc-$GCC/configure \
--disable-libada \
--disable-libsanitizer \
--disable-libquadmath-support \
- --disable-lto \
- --with-sysroot=/usr/local/$ARCH-sun-solaris2.10
+ --disable-lto
hide_output make -j10
hide_output make install
From 4c928f95bb557adedd080bbd1e29daf65d5c9ece Mon Sep 17 00:00:00 2001
From: bgermann <bgermann@users.noreply.github.com>
Date: Tue, 17 Oct 2017 16:39:15 +0200
Subject: [PATCH 08/10] Remove tabs
(cherry picked from commit 0597bdabff5b8ee2d966c90b1836d67631327787)
---
src/ci/docker/cross2/build-solaris-toolchain.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ci/docker/cross2/build-solaris-toolchain.sh b/src/ci/docker/cross2/build-solaris-toolchain.sh
index 29d1d4414f2dd..71ab998aab20d 100755
--- a/src/ci/docker/cross2/build-solaris-toolchain.sh
+++ b/src/ci/docker/cross2/build-solaris-toolchain.sh
@@ -57,8 +57,8 @@ done
# This is for Solaris 10 compatibility.
rm usr/include/link.h
patch -p0 << 'EOF'
---- usr/include/string.h 2017-10-09 03:15:04.000000000 +0200
-+++ usr/include/string10.h 2017-10-16 11:27:26.498764422 +0200
+--- usr/include/string.h
++++ usr/include/string10.h
@@ -93 +92,0 @@
-extern size_t strnlen(const char *, size_t);
EOF
From 9d8320b16e1f264f7e045600827b793717c8a065 Mon Sep 17 00:00:00 2001
From: "Carol (Nichols || Goulding)" <carol.nichols@gmail.com>
Date: Thu, 26 Oct 2017 14:56:26 -0400
Subject: [PATCH 09/10] Update the book on beta to fix the print button
Connects to #45552.
---
src/doc/book | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/doc/book b/src/doc/book
index 08e79609ce885..7db393dae740d 160000
--- a/src/doc/book
+++ b/src/doc/book
@@ -1 +1 @@
-Subproject commit 08e79609ce88583fa7286157dfe497486a09fabe
+Subproject commit 7db393dae740d84775b73f403123c866e94e3a5b
From baa33ca139d8dd1c79adc9f95f26a3d88545bfff Mon Sep 17 00:00:00 2001
From: kennytm <kennytm@gmail.com>
Date: Sat, 28 Oct 2017 03:14:25 +0800
Subject: [PATCH 10/10] ci: Upgrade Android SDK/NDK and refactor to use
sdkmanager/avdmanager.
* SDK tools is upgraded to 27.0.0.
- Refactored to use `sdkmanager`/`avdmanager` instead of the deprecated
`android` tool.
* The Java version used by Android SDK is downgraded to OpenJDK-8, in order
to download the SDK through HTTPS.
* NDK is upgrade to r15c.
- Dropped support for android-9 (2.3 / Gingerbread), the minimal
supported version is now android-14 (4.0 / Ice Cream Sandwich).
- Changed the default Android compiler from GCC to clang.
- For details of change introduced by NDK r15, see
https://github.com/android-ndk/ndk/wiki/Changelog-r15.
---
src/bootstrap/cc_detect.rs | 35 +++++++++++--
src/ci/docker/arm-android/Dockerfile | 14 +++--
.../disabled/dist-aarch64-android/Dockerfile | 2 +-
.../disabled/dist-armv7-android/Dockerfile | 16 +++---
.../disabled/dist-i686-android/Dockerfile | 16 +++---
.../disabled/dist-x86_64-android/Dockerfile | 2 +-
src/ci/docker/dist-android/Dockerfile | 12 ++---
src/ci/docker/scripts/android-sdk.sh | 52 ++++++++++++-------
8 files changed, 97 insertions(+), 52 deletions(-)
diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
index 08df65c761182..76bb7ccbc1748 100644
--- a/src/bootstrap/cc_detect.rs
+++ b/src/bootstrap/cc_detect.rs
@@ -53,7 +53,7 @@ pub fn find(build: &mut Build) {
if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
cfg.compiler(cc);
} else {
- set_compiler(&mut cfg, "gcc", target, config, build);
+ set_compiler(&mut cfg, Language::C, target, config, build);
}
let compiler = cfg.get_compiler();
@@ -74,7 +74,7 @@ pub fn find(build: &mut Build) {
if let Some(cxx) = config.and_then(|c| c.cxx.as_ref()) {
cfg.compiler(cxx);
} else {
- set_compiler(&mut cfg, "g++", host, config, build);
+ set_compiler(&mut cfg, Language::CPlusPlus, host, config, build);
}
let compiler = cfg.get_compiler();
build.verbose(&format!("CXX_{} = {:?}", host, compiler.path()));
@@ -83,7 +83,7 @@ pub fn find(build: &mut Build) {
}
fn set_compiler(cfg: &mut cc::Build,
- gnu_compiler: &str,
+ compiler: Language,
target: Interned<String>,
config: Option<&Target>,
build: &Build) {
@@ -94,7 +94,7 @@ fn set_compiler(cfg: &mut cc::Build,
t if t.contains("android") => {
if let Some(ndk) = config.and_then(|c| c.ndk.as_ref()) {
let target = target.replace("armv7", "arm");
- let compiler = format!("{}-{}", target, gnu_compiler);
+ let compiler = format!("{}-{}", target, compiler.clang());
cfg.compiler(ndk.join("bin").join(compiler));
}
}
@@ -103,6 +103,7 @@ fn set_compiler(cfg: &mut cc::Build,
// which is a gcc version from ports, if this is the case.
t if t.contains("openbsd") => {
let c = cfg.get_compiler();
+ let gnu_compiler = compiler.gcc();
if !c.path().ends_with(gnu_compiler) {
return
}
@@ -145,3 +146,29 @@ fn set_compiler(cfg: &mut cc::Build,
_ => {}
}
}
+
+/// The target programming language for a native compiler.
+enum Language {
+ /// The compiler is targeting C.
+ C,
+ /// The compiler is targeting C++.
+ CPlusPlus,
+}
+
+impl Language {
+ /// Obtains the name of a compiler in the GCC collection.
+ fn gcc(self) -> &'static str {
+ match self {
+ Language::C => "gcc",
+ Language::CPlusPlus => "g++",
+ }
+ }
+
+ /// Obtains the name of a compiler in the clang suite.
+ fn clang(self) -> &'static str {
+ match self {
+ Language::C => "clang",
+ Language::CPlusPlus => "clang++",
+ }
+ }
+}
diff --git a/src/ci/docker/arm-android/Dockerfile b/src/ci/docker/arm-android/Dockerfile
index 49d07d28d3c8e..f2773a720cfbc 100644
--- a/src/ci/docker/arm-android/Dockerfile
+++ b/src/ci/docker/arm-android/Dockerfile
@@ -5,21 +5,27 @@ RUN sh /scripts/android-base-apt-get.sh
COPY scripts/android-ndk.sh /scripts/
RUN . /scripts/android-ndk.sh && \
- download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm 9
+ download_and_make_toolchain android-ndk-r15c-linux-x86_64.zip arm 14
+# Note:
+# Do not upgrade to `openjdk-9-jre-headless`, as it will cause certificate error
+# when installing the Android SDK (see PR #45193). This is unfortunate, but
+# every search result suggested either disabling HTTPS or replacing JDK 9 by
+# JDK 8 as the solution (e.g. https://stackoverflow.com/q/41421340). :|
RUN dpkg --add-architecture i386 && \
apt-get update && \
apt-get install -y --no-install-recommends \
libgl1-mesa-glx \
libpulse0 \
libstdc++6:i386 \
- openjdk-9-jre-headless \
+ openjdk-8-jre-headless \
tzdata
COPY scripts/android-sdk.sh /scripts/
RUN . /scripts/android-sdk.sh && \
- download_and_create_avd tools_r25.2.5-linux.zip armeabi-v7a 18
+ download_and_create_avd 4333796 armeabi-v7a 18
+ENV PATH=$PATH:/android/sdk/emulator
ENV PATH=$PATH:/android/sdk/tools
ENV PATH=$PATH:/android/sdk/platform-tools
@@ -27,7 +33,7 @@ ENV TARGETS=arm-linux-androideabi
ENV RUST_CONFIGURE_ARGS \
--target=$TARGETS \
- --arm-linux-androideabi-ndk=/android/ndk/arm-9
+ --arm-linux-androideabi-ndk=/android/ndk/arm-14
ENV SCRIPT python2.7 ../x.py test --target $TARGETS
diff --git a/src/ci/docker/disabled/dist-aarch64-android/Dockerfile b/src/ci/docker/disabled/dist-aarch64-android/Dockerfile
index 20d823a3d7338..ce5e8cfaf0958 100644
--- a/src/ci/docker/disabled/dist-aarch64-android/Dockerfile
+++ b/src/ci/docker/disabled/dist-aarch64-android/Dockerfile
@@ -5,7 +5,7 @@ RUN sh /scripts/android-base-apt-get.sh
COPY scripts/android-ndk.sh /scripts/
RUN . /scripts/android-ndk.sh && \
- download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm64 21
+ download_and_make_toolchain android-ndk-r15c-linux-x86_64.zip arm64 21
ENV PATH=$PATH:/android/ndk/arm64-21/bin
diff --git a/src/ci/docker/disabled/dist-armv7-android/Dockerfile b/src/ci/docker/disabled/dist-armv7-android/Dockerfile
index 3435d641a13c5..3177fa2147fa1 100644
--- a/src/ci/docker/disabled/dist-armv7-android/Dockerfile
+++ b/src/ci/docker/disabled/dist-armv7-android/Dockerfile
@@ -5,17 +5,17 @@ RUN sh /scripts/android-base-apt-get.sh
COPY scripts/android-ndk.sh /scripts/
RUN . /scripts/android-ndk.sh && \
- download_ndk android-ndk-r13b-linux-x86_64.zip && \
- make_standalone_toolchain arm 9 && \
+ download_ndk android-ndk-r15c-linux-x86_64.zip && \
+ make_standalone_toolchain arm 14 && \
make_standalone_toolchain arm 21 && \
remove_ndk
RUN chmod 777 /android/ndk && \
ln -s /android/ndk/arm-21 /android/ndk/arm
-ENV PATH=$PATH:/android/ndk/arm-9/bin
+ENV PATH=$PATH:/android/ndk/arm-14/bin
-ENV DEP_Z_ROOT=/android/ndk/arm-9/sysroot/usr/
+ENV DEP_Z_ROOT=/android/ndk/arm-14/sysroot/usr/
ENV HOSTS=armv7-linux-androideabi
@@ -27,18 +27,18 @@ ENV RUST_CONFIGURE_ARGS \
--enable-extended \
--enable-cargo-openssl-static
-# We support api level 9, but api level 21 is required to build llvm. To
+# We support api level 14, but api level 21 is required to build llvm. To
# overcome this problem we use a ndk with api level 21 to build llvm and then
-# switch to a ndk with api level 9 to complete the build. When the linker is
+# switch to a ndk with api level 14 to complete the build. When the linker is
# invoked there are missing symbols (like sigsetempty, not available with api
-# level 9), the default linker behavior is to generate an error, to allow the
+# level 14), the default linker behavior is to generate an error, to allow the
# build to finish we use --warn-unresolved-symbols. Note that the missing
# symbols does not affect std, only the compiler (llvm) and cargo (openssl).
ENV SCRIPT \
python2.7 ../x.py build src/llvm --host $HOSTS --target $HOSTS && \
(export RUSTFLAGS="\"-C link-arg=-Wl,--warn-unresolved-symbols\""; \
rm /android/ndk/arm && \
- ln -s /android/ndk/arm-9 /android/ndk/arm && \
+ ln -s /android/ndk/arm-14 /android/ndk/arm && \
python2.7 ../x.py dist --host $HOSTS --target $HOSTS)
COPY scripts/sccache.sh /scripts/
diff --git a/src/ci/docker/disabled/dist-i686-android/Dockerfile b/src/ci/docker/disabled/dist-i686-android/Dockerfile
index 4bb7053760f9c..ace9c4feb4f3b 100644
--- a/src/ci/docker/disabled/dist-i686-android/Dockerfile
+++ b/src/ci/docker/disabled/dist-i686-android/Dockerfile
@@ -5,17 +5,17 @@ RUN sh /scripts/android-base-apt-get.sh
COPY scripts/android-ndk.sh /scripts/
RUN . /scripts/android-ndk.sh && \
- download_ndk android-ndk-r13b-linux-x86_64.zip && \
- make_standalone_toolchain x86 9 && \
+ download_ndk android-ndk-r15c-linux-x86_64.zip && \
+ make_standalone_toolchain x86 14 && \
make_standalone_toolchain x86 21 && \
remove_ndk
RUN chmod 777 /android/ndk && \
ln -s /android/ndk/x86-21 /android/ndk/x86
-ENV PATH=$PATH:/android/ndk/x86-9/bin
+ENV PATH=$PATH:/android/ndk/x86-14/bin
-ENV DEP_Z_ROOT=/android/ndk/x86-9/sysroot/usr/
+ENV DEP_Z_ROOT=/android/ndk/x86-14/sysroot/usr/
ENV HOSTS=i686-linux-android
@@ -27,18 +27,18 @@ ENV RUST_CONFIGURE_ARGS \
--enable-extended \
--enable-cargo-openssl-static
-# We support api level 9, but api level 21 is required to build llvm. To
+# We support api level 14, but api level 21 is required to build llvm. To
# overcome this problem we use a ndk with api level 21 to build llvm and then
-# switch to a ndk with api level 9 to complete the build. When the linker is
+# switch to a ndk with api level 14 to complete the build. When the linker is
# invoked there are missing symbols (like sigsetempty, not available with api
-# level 9), the default linker behavior is to generate an error, to allow the
+# level 14), the default linker behavior is to generate an error, to allow the
# build to finish we use --warn-unresolved-symbols. Note that the missing
# symbols does not affect std, only the compiler (llvm) and cargo (openssl).
ENV SCRIPT \
python2.7 ../x.py build src/llvm --host $HOSTS --target $HOSTS && \
(export RUSTFLAGS="\"-C link-arg=-Wl,--warn-unresolved-symbols\""; \
rm /android/ndk/x86 && \
- ln -s /android/ndk/x86-9 /android/ndk/x86 && \
+ ln -s /android/ndk/x86-14 /android/ndk/x86 && \
python2.7 ../x.py dist --host $HOSTS --target $HOSTS)
COPY scripts/sccache.sh /scripts/
diff --git a/src/ci/docker/disabled/dist-x86_64-android/Dockerfile b/src/ci/docker/disabled/dist-x86_64-android/Dockerfile
index 525b218417b67..322d26f0adc4c 100644
--- a/src/ci/docker/disabled/dist-x86_64-android/Dockerfile
+++ b/src/ci/docker/disabled/dist-x86_64-android/Dockerfile
@@ -5,7 +5,7 @@ RUN sh /scripts/android-base-apt-get.sh
COPY scripts/android-ndk.sh /scripts/
RUN . /scripts/android-ndk.sh && \
- download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip x86_64 21
+ download_and_make_toolchain android-ndk-r15c-linux-x86_64.zip x86_64 21
ENV PATH=$PATH:/android/ndk/x86_64-21/bin
diff --git a/src/ci/docker/dist-android/Dockerfile b/src/ci/docker/dist-android/Dockerfile
index a36f7fc1ac528..5d7545a3c2a95 100644
--- a/src/ci/docker/dist-android/Dockerfile
+++ b/src/ci/docker/dist-android/Dockerfile
@@ -6,9 +6,9 @@ RUN sh /scripts/android-base-apt-get.sh
# ndk
COPY scripts/android-ndk.sh /scripts/
RUN . /scripts/android-ndk.sh && \
- download_ndk android-ndk-r13b-linux-x86_64.zip && \
- make_standalone_toolchain arm 9 && \
- make_standalone_toolchain x86 9 && \
+ download_ndk android-ndk-r15c-linux-x86_64.zip && \
+ make_standalone_toolchain arm 14 && \
+ make_standalone_toolchain x86 14 && \
make_standalone_toolchain arm64 21 && \
make_standalone_toolchain x86_64 21 && \
remove_ndk
@@ -23,9 +23,9 @@ ENV TARGETS=$TARGETS,x86_64-linux-android
ENV RUST_CONFIGURE_ARGS \
--target=$TARGETS \
--enable-extended \
- --arm-linux-androideabi-ndk=/android/ndk/arm-9 \
- --armv7-linux-androideabi-ndk=/android/ndk/arm-9 \
- --i686-linux-android-ndk=/android/ndk/x86-9 \
+ --arm-linux-androideabi-ndk=/android/ndk/arm-14 \
+ --armv7-linux-androideabi-ndk=/android/ndk/arm-14 \
+ --i686-linux-android-ndk=/android/ndk/x86-14 \
--aarch64-linux-android-ndk=/android/ndk/arm64-21 \
--x86_64-linux-android-ndk=/android/ndk/x86_64-21
diff --git a/src/ci/docker/scripts/android-sdk.sh b/src/ci/docker/scripts/android-sdk.sh
index 3aa2b9d58d57a..99c5776c2e849 100644
--- a/src/ci/docker/scripts/android-sdk.sh
+++ b/src/ci/docker/scripts/android-sdk.sh
@@ -10,40 +10,40 @@
set -ex
-URL=https://dl.google.com/android/repository
+export ANDROID_HOME=/android/sdk
+PATH=$PATH:"${ANDROID_HOME}/tools/bin"
download_sdk() {
- mkdir -p /android/sdk
- cd /android/sdk
- curl -fO $URL/$1
- unzip -q $1
- rm -rf $1
+ mkdir -p /android
+ curl -fo sdk.zip "https://dl.google.com/android/repository/sdk-tools-linux-$1.zip"
+ unzip -q sdk.zip -d "$ANDROID_HOME"
+ rm -f sdk.zip
}
download_sysimage() {
- # See https://developer.android.com/studio/tools/help/android.html
abi=$1
api=$2
- filter="platform-tools,android-$api"
- filter="$filter,sys-img-$abi-android-$api"
-
- # Keep printing yes to accept the licenses
- while true; do echo yes; sleep 10; done | \
- /android/sdk/tools/android update sdk -a --no-ui \
- --filter "$filter" --no-https
+ # See https://developer.android.com/studio/command-line/sdkmanager.html for
+ # usage of `sdkmanager`.
+ #
+ # The output from sdkmanager is so noisy that it will occupy all of the 4 MB
+ # log extremely quickly. Thus we must silence all output.
+ yes | sdkmanager --licenses > /dev/null
+ sdkmanager platform-tools emulator \
+ "platforms;android-$api" \
+ "system-images;android-$api;default;$abi" > /dev/null
}
create_avd() {
- # See https://developer.android.com/studio/tools/help/android.html
abi=$1
api=$2
- echo no | \
- /android/sdk/tools/android create avd \
- --name $abi-$api \
- --target android-$api \
- --abi $abi
+ # See https://developer.android.com/studio/command-line/avdmanager.html for
+ # usage of `avdmanager`.
+ echo no | avdmanager create avd \
+ -n "$abi-$api" \
+ -k "system-images;android-$api;default;$abi"
}
download_and_create_avd() {
@@ -51,3 +51,15 @@ download_and_create_avd() {
download_sysimage $2 $3
create_avd $2 $3
}
+
+# Usage:
+#
+# setup_android_sdk 4333796 armeabi-v7a 18
+#
+# 4333796 =>
+# SDK tool version.
+# Copy from https://developer.android.com/studio/index.html#command-tools
+# armeabi-v7a =>
+# System image ABI
+# 18 =>
+# Android API Level (18 = Android 4.3 = Jelly Bean MR2)