diff options
| author | bors <bors@rust-lang.org> | 2022-07-18 23:20:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-18 23:20:08 +0000 |
| commit | 475aec11886250ec93fbb6e8e1e3dbd4b35dfc89 (patch) | |
| tree | 15a6fd181829b949e37520a8a8e994b3c6851253 | |
| parent | f8588549c3c3d45c32b404210cada01e2a45def3 (diff) | |
| parent | 45575d23f316af7476ccd0a895234ac59c47a6be (diff) | |
| download | rust-475aec11886250ec93fbb6e8e1e3dbd4b35dfc89.tar.gz rust-475aec11886250ec93fbb6e8e1e3dbd4b35dfc89.zip | |
Auto merge of #99442 - Kobzol:revert-99062-lld-icf, r=Mark-Simulacrum
Revert "Use ICF (identical code folding) for building rustc" Reverts rust-lang/rust#99062 Fixes: https://github.com/rust-lang/rust/issues/99440
| -rw-r--r-- | src/bootstrap/compile.rs | 6 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 3 | ||||
| -rwxr-xr-x | src/ci/pgo.sh | 4 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index aa7cda46bda..3d678b2290d 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -651,12 +651,6 @@ impl Step for Rustc { panic!("Cannot use and generate PGO profiles at the same time"); } - // With LLD, we can use ICF (identical code folding) to reduce the executable size - // of librustc_driver/rustc and to improve i-cache utilization. - if builder.config.use_lld { - cargo.rustflag("-Clink-args=-Wl,--icf=all"); - } - let is_collecting = if let Some(path) = &builder.config.rust_profile_generate { if compiler.stage == 1 { cargo.rustflag(&format!("-Cprofile-generate={}", path)); 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 f262bc3c7d8..ab6c888030e 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 @@ -122,8 +122,7 @@ 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 rust.jemalloc \ - --set rust.use-lld=true + --set rust.jemalloc ENV SCRIPT ../src/ci/pgo.sh python3 ../x.py dist \ --host $HOSTS --target $HOSTS \ --include-default-paths \ diff --git a/src/ci/pgo.sh b/src/ci/pgo.sh index 4773dc09960..28bed1fa035 100755 --- a/src/ci/pgo.sh +++ b/src/ci/pgo.sh @@ -195,7 +195,3 @@ rm -r $BUILD_ARTIFACTS/llvm $BUILD_ARTIFACTS/lld $@ \ --rust-profile-use=${RUSTC_PROFILE_MERGED_FILE} \ --llvm-profile-use=${LLVM_PROFILE_MERGED_FILE} - -echo "Rustc binary size" -ls -la ./build/$PGO_HOST/stage2/bin -ls -la ./build/$PGO_HOST/stage2/lib |