Skip to content

Commit 4559140

Browse files
committedOct 23, 2021
Auto merge of rust-lang#90175 - cuviper:min-llvm-12, r=nagisa
Update the minimum external LLVM to 12 With this change, we'll have stable support for LLVM 12 and 13. For reference, the previous increase to LLVM 10 was rust-lang#83387, and this replaces the pending increase to LLVM 11 in rust-lang#90062. r? `@nagisa` `@nikic`
2 parents 91b9319 + 8b1504c commit 4559140

File tree

64 files changed

+63
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+63
-328
lines changed
 

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: mingw-check
4444
os: ubuntu-latest-xl
4545
env: {}
46-
- name: x86_64-gnu-llvm-10
46+
- name: x86_64-gnu-llvm-12
4747
os: ubuntu-latest-xl
4848
env: {}
4949
- name: x86_64-gnu-tools
@@ -274,7 +274,7 @@ jobs:
274274
- name: x86_64-gnu-distcheck
275275
os: ubuntu-latest-xl
276276
env: {}
277-
- name: x86_64-gnu-llvm-10
277+
- name: x86_64-gnu-llvm-12
278278
env:
279279
RUST_BACKTRACE: 1
280280
os: ubuntu-latest-xl

‎compiler/rustc_codegen_llvm/src/llvm_util.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ unsafe fn configure_llvm(sess: &Session) {
9595
// Ref:
9696
// - https://github.com/rust-lang/rust/issues/85351
9797
// - https://reviews.llvm.org/D103167
98-
let llvm_version = llvm_util::get_version();
99-
if llvm_version >= (11, 0, 0) && llvm_version < (13, 0, 0) {
98+
if llvm_util::get_version() < (13, 0, 0) {
10099
add("-enable-machine-outliner=never", false);
101100
}
102101

0 commit comments

Comments
 (0)
Please sign in to comment.