Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ecc1899

Browse files
committedDec 27, 2024
Auto merge of #134690 - clubby789:ci-clang-lto, r=Kobzol
CI: Add LTO support to clang in dist-x86_64-linux After rust-lang/cc-rs#1279, we attempt to pass `-flto=thin` to clang. In `dist-x86_64-linux`, we don't build clang with the `LLVMgold.so` library so this fails. This attempts to resolve this First, pass the binutils plugin include directory to Clang, [which will build the library](https://github.com/llvm/llvm-project/blob/2d6d723a85c2d007b0359c206d66cd2e5a9f00e1/llvm/docs/GoldPlugin.rst#how-to-build-it) Second, this library depends on the *version of libstdc++ that we built* specifically. However, despite both the RPATH and LD_LIBRARY_PATH pointing to `/rustroot/lib`, we incorrectly resolve to the system libstdc++, which doesn't load. ``` # LD_DEBUG=libs,files 2219: file=libstdc++.so.6 [0]; needed by /rustroot/bin/../lib/LLVMgold.so [0] 2219: find library=libstdc++.so.6 [0]; searching 2219: search path=/rustroot/bin/../lib/../lib (RPATH from file /rustroot/bin/../lib/LLVMgold.so) 2219: trying file=/rustroot/bin/../lib/../lib/libstdc++.so.6 2219: search path=/usr/lib64/tls:/usr/lib64 (system search path) 2219: trying file=/usr/lib64/tls/libstdc++.so.6 2219: trying file=/usr/lib64/libstdc++.so.6 ``` Using `LD_PRELOAD` causes it to correctly load the library I think this is probably not the most maintainable way to do this, so opening to see if this is desired and if there's a better way of doing this
2 parents dd84b7d + 9e57593 commit ecc1899

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed
 

‎src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
5050

5151
# Need at least GCC 5.1 to compile LLVM nowadays
5252
COPY host-x86_64/dist-x86_64-linux/build-gcc.sh /tmp/
53+
ENV GCC_VERSION=9.5.0
5354
RUN ./build-gcc.sh && yum remove -y gcc gcc-c++
5455

5556
COPY scripts/cmake.sh /tmp/

‎src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ RUN mkdir -p /rustroot/bin
4444
ENV PATH=/rustroot/bin:$PATH
4545
ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib32:/rustroot/lib
4646
ENV PKG_CONFIG_PATH=/rustroot/lib/pkgconfig
47+
# Clang needs to access GCC headers to enable linker plugin LTO
4748
WORKDIR /tmp
4849
RUN mkdir /home/user
4950
COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
5051

5152
# Need at least GCC 5.1 to compile LLVM nowadays
5253
COPY host-x86_64/dist-x86_64-linux/build-gcc.sh /tmp/
54+
ENV GCC_VERSION=9.5.0
5355
RUN ./build-gcc.sh && yum remove -y gcc gcc-c++
5456

5557
# LLVM 17 needs cmake 3.20 or higher.
@@ -105,3 +107,7 @@ ENV DIST_SRC 1
105107
ENV LIBCURL_NO_PKG_CONFIG 1
106108

107109
ENV DIST_REQUIRE_ALL_TOOLS 1
110+
111+
# FIXME: Without this, LLVMgold.so incorrectly resolves to the system
112+
# libstdc++, instead of the one we build.
113+
ENV LD_PRELOAD=/rustroot/lib64/libstdc++.so.6

‎src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ hide_output \
3939
-DLLVM_INCLUDE_TESTS=OFF \
4040
-DLLVM_INCLUDE_EXAMPLES=OFF \
4141
-DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt;bolt" \
42+
-DLLVM_BINUTILS_INCDIR="/rustroot/lib/gcc/x86_64-pc-linux-gnu/$GCC_VERSION/plugin/include/" \
4243
-DC_INCLUDE_DIRS="$INC"
4344

4445
hide_output make -j$(nproc)

‎src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/usr/bin/env bash
2-
set -ex
2+
set -eux
33

44
source shared.sh
55

66
# Note: in the future when bumping to version 10.1.0, also take care of the sed block below.
7-
GCC=9.5.0
7+
# This version is specified in the Dockerfile
8+
GCC=$GCC_VERSION
89

910
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.xz | xzcat | tar xf -
1011
cd gcc-$GCC

0 commit comments

Comments
 (0)
Failed to load comments.