From 09685da5d1f8a3b467c4db06732f11829c13735a Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 7 Apr 2022 15:29:14 +0000 Subject: [PATCH 1/2] Update linker-plugin-lto.md to contain up to Rust 1.60 The table rows were obtained via the script embedded in the page. --- src/doc/rustc/src/linker-plugin-lto.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/doc/rustc/src/linker-plugin-lto.md b/src/doc/rustc/src/linker-plugin-lto.md index 941c65922d8f0..f09eac1c06759 100644 --- a/src/doc/rustc/src/linker-plugin-lto.md +++ b/src/doc/rustc/src/linker-plugin-lto.md @@ -136,7 +136,7 @@ able to get around this problem by setting `-Clinker=lld-link` in RUSTFLAGS ```sh rustup toolchain install --profile minimal nightly MINOR_VERSION=$(rustc +nightly --version | cut -d . -f 2) -LOWER_BOUND=44 +LOWER_BOUND=61 llvm_version() { toolchain="$1" @@ -179,5 +179,19 @@ The following table shows known good combinations of toolchain versions. | Rust 1.44 | Clang 9 | | Rust 1.45 | Clang 10 | | Rust 1.46 | Clang 10 | +| Rust 1.47 | Clang 11 | +| Rust 1.48 | Clang 11 | +| Rust 1.49 | Clang | +| Rust 1.50 | Clang | +| Rust 1.51 | Clang 11 | +| Rust 1.52 | Clang 12 | +| Rust 1.53 | Clang 12 | +| Rust 1.54 | Clang 12 | +| Rust 1.55 | Clang 12 | +| Rust 1.56 | Clang 13 | +| Rust 1.57 | Clang 13 | +| Rust 1.58 | Clang 13 | +| Rust 1.59 | Clang 13 | +| Rust 1.60 | Clang 14 | Note that the compatibility policy for this feature might change in the future. From a404b96ca1d1609173eece73bd94976b740f0cf5 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 7 Apr 2022 15:30:19 +0000 Subject: [PATCH 2/2] Manually mark 1.49 and 1.50 in linker-plugin-lto.md as Clang 11 `rustc +1.49.0 -Vv` and `rustc +1.50.0 -Vv` do not print out an `LLVM version` line, which prevents the script from detecting them. --- src/doc/rustc/src/linker-plugin-lto.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doc/rustc/src/linker-plugin-lto.md b/src/doc/rustc/src/linker-plugin-lto.md index f09eac1c06759..e7bf8d9a36f25 100644 --- a/src/doc/rustc/src/linker-plugin-lto.md +++ b/src/doc/rustc/src/linker-plugin-lto.md @@ -181,8 +181,8 @@ The following table shows known good combinations of toolchain versions. | Rust 1.46 | Clang 10 | | Rust 1.47 | Clang 11 | | Rust 1.48 | Clang 11 | -| Rust 1.49 | Clang | -| Rust 1.50 | Clang | +| Rust 1.49 | Clang 11 | +| Rust 1.50 | Clang 11 | | Rust 1.51 | Clang 11 | | Rust 1.52 | Clang 12 | | Rust 1.53 | Clang 12 |