about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-06-22 01:42:33 +0200
committerGitHub <noreply@github.com>2019-06-22 01:42:33 +0200
commit653b44dbf76f3cdaf1e4d97e127fd9574af93616 (patch)
tree6eb0f095dd42464d6aca372b6a8d77cf797d74c5
parent18bb75477a4053534d8e6c28d573bde03f6ede26 (diff)
parentf65b6a87865d3768a798d33e97aa52656eeabe68 (diff)
downloadrust-653b44dbf76f3cdaf1e4d97e127fd9574af93616.tar.gz
rust-653b44dbf76f3cdaf1e4d97e127fd9574af93616.zip
Rollup merge of #61267 - michaelwoerister:update-xlto-table, r=alexcrichton
rustc-book: Update the rustc/clang compatibility table for xLTO.

Firefox is using these combinations successfully.
-rw-r--r--src/doc/rustc/src/linker-plugin-lto.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/doc/rustc/src/linker-plugin-lto.md b/src/doc/rustc/src/linker-plugin-lto.md
index 73a2efcb33a..2ae726c4ba6 100644
--- a/src/doc/rustc/src/linker-plugin-lto.md
+++ b/src/doc/rustc/src/linker-plugin-lto.md
@@ -100,9 +100,10 @@ LLVM. However, the approximation is usually reliable.
 
 The following table shows known good combinations of toolchain versions.
 
-|           | Clang 7   | Clang 8   |
+|           |  Clang 7  |  Clang 8  |
 |-----------|-----------|-----------|
 | Rust 1.34 |     ✗     |     ✓     |
-| Rust 1.35 |     ✗     |    ✓(?)   |
+| Rust 1.35 |     ✗     |     ✓     |
+| Rust 1.36 |     ✗     |     ✓     |
 
 Note that the compatibility policy for this feature might change in the future.