From e066deae088dfeef66c414c181925b28b9a25511 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 27 Jan 2021 21:27:46 +0100 Subject: [PATCH 1/2] Update Python and Clang on x86 dist images LLVM 12 no longer builds with Python 2, so install Python 3 in preparatin. However, Clang 10 does not build with Python 3, so we need update to Clang 11 as well, which supports both. Unfortunately, doing so results in errors while linking the libLLVM.so into other binaries: > __morestack: invalid needed version 2 This is fixed by using LLD instead. Possibly this is due to a binutils linker bug, but updating to the latest binutils version does not fix it. --- src/bootstrap/native.rs | 3 +++ src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile | 8 +++++--- src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 8 +++++--- .../docker/host-x86_64/dist-x86_64-linux/build-clang.sh | 2 +- .../docker/host-x86_64/dist-x86_64-linux/build-python.sh | 6 +++--- src/ci/pgo.sh | 2 +- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 609ac8b3669..9c543d49253 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -556,6 +556,9 @@ fn run(self, builder: &Builder<'_>) -> PathBuf { t!(fs::create_dir_all(&out_dir)); let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld")); + if let Some(ref linker) = builder.config.llvm_use_linker { + cfg.define("LLVM_USE_LINKER", linker); + } configure_cmake(builder, target, &mut cfg, true); // This is an awful, awful hack. Discovered when we migrated to using diff --git a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile index 22d7cbb0d14..0f4e8a9cf21 100644 --- a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile @@ -68,11 +68,11 @@ RUN ./build-binutils.sh COPY host-x86_64/dist-x86_64-linux/build-gcc.sh /tmp/ RUN ./build-gcc.sh && apt-get remove -y gcc g++ -# Debian 6 has Python 2.6 by default, but LLVM needs 2.7+ +# Debian 6 has Python 2.6 by default, but LLVM >= 12 needs Python 3 COPY host-x86_64/dist-x86_64-linux/build-python.sh /tmp/ RUN ./build-python.sh -# LLVM needs cmake 3.4.3 or higher, and is planning to raise to 3.13.4. +# LLVM needs cmake 3.13.4 or higher COPY host-x86_64/dist-x86_64-linux/build-cmake.sh /tmp/ RUN ./build-cmake.sh @@ -94,8 +94,10 @@ ENV RUST_CONFIGURE_ARGS \ --set target.i686-unknown-linux-gnu.linker=clang \ --build=i686-unknown-linux-gnu \ --set llvm.ninja=false \ + --set llvm.use-linker=lld \ + --set rust.use-lld=true \ --set rust.jemalloc -ENV SCRIPT python2.7 ../x.py dist --build $HOSTS --host $HOSTS --target $HOSTS +ENV SCRIPT python3 ../x.py dist --build $HOSTS --host $HOSTS --target $HOSTS ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=clang # This was added when we switched from gcc to clang. It's not clear why this is diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index d1b4bbf7fff..e1d9430554f 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -68,11 +68,11 @@ RUN ./build-binutils.sh COPY host-x86_64/dist-x86_64-linux/build-gcc.sh /tmp/ RUN ./build-gcc.sh && apt-get remove -y gcc g++ -# Debian 6 has Python 2.6 by default, but LLVM needs 2.7+ +# Debian 6 has Python 2.6 by default, but LLVM >= 12 needs Python 3 COPY host-x86_64/dist-x86_64-linux/build-python.sh /tmp/ RUN ./build-python.sh -# LLVM needs cmake 3.4.3 or higher, and is planning to raise to 3.13.4. +# LLVM needs cmake 3.13.4 or higher COPY host-x86_64/dist-x86_64-linux/build-cmake.sh /tmp/ RUN ./build-cmake.sh @@ -99,8 +99,10 @@ ENV RUST_CONFIGURE_ARGS \ --set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \ --set llvm.thin-lto=true \ --set llvm.ninja=false \ + --set llvm.use-linker=lld \ + --set rust.use-lld=true \ --set rust.jemalloc -ENV SCRIPT ../src/ci/pgo.sh python2.7 ../x.py dist \ +ENV SCRIPT ../src/ci/pgo.sh python3 ../x.py dist \ --host $HOSTS --target $HOSTS \ --include-default-paths \ src/tools/build-manifest diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh index 969443ac094..6c4f6ff709b 100755 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh @@ -4,7 +4,7 @@ set -ex source shared.sh -LLVM=llvmorg-10.0.0 +LLVM=llvmorg-11.0.1 mkdir llvm-project cd llvm-project diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-python.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-python.sh index c172b978112..52f845e71f6 100755 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-python.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-python.sh @@ -3,7 +3,7 @@ set -ex source shared.sh -curl https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz | \ +curl https://www.python.org/ftp/python/3.9.1/Python-3.9.1.tgz | \ tar xzf - mkdir python-build @@ -12,10 +12,10 @@ cd python-build # Gotta do some hackery to tell python about our custom OpenSSL build, but other # than that fairly normal. CFLAGS='-I /rustroot/include' LDFLAGS='-L /rustroot/lib -L /rustroot/lib64' \ - hide_output ../Python-2.7.12/configure --prefix=/rustroot + hide_output ../Python-3.9.1/configure --prefix=/rustroot hide_output make -j10 hide_output make install cd .. rm -rf python-build -rm -rf Python-2.7.12 +rm -rf Python-3.9.1 diff --git a/src/ci/pgo.sh b/src/ci/pgo.sh index a5f47ca78ff..ec08fec7fb2 100755 --- a/src/ci/pgo.sh +++ b/src/ci/pgo.sh @@ -4,7 +4,7 @@ set -euxo pipefail rm -rf /tmp/rustc-pgo -python2.7 ../x.py build --target=$PGO_HOST --host=$PGO_HOST \ +python3 ../x.py build --target=$PGO_HOST --host=$PGO_HOST \ --stage 2 library/std --rust-profile-generate=/tmp/rustc-pgo ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \ From a84ff2b6d4b6f1e5a315cc043bb8e2b730f254f4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 28 Jan 2021 23:01:11 +0100 Subject: [PATCH 2/2] Use LLVM_USE_LINKER instead of LLVM_ENABLE_LLD This avoids a conflict if llvm.thin-lto=true is combined with an explicit llvm.use-linker=lld. --- src/bootstrap/native.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 9c543d49253..8f7ed87d063 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -201,7 +201,7 @@ fn run(self, builder: &Builder<'_>) -> PathBuf { if builder.config.llvm_thin_lto { cfg.define("LLVM_ENABLE_LTO", "Thin"); if !target.contains("apple") { - cfg.define("LLVM_ENABLE_LLD", "ON"); + cfg.define("LLVM_USE_LINKER", "lld"); } }