diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-08-16 06:05:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-16 06:05:57 +0200 |
| commit | 0b19a185dbeaad0925480df0bba641749ad2d850 (patch) | |
| tree | d8f3a2b92bb06513fc8dda38390a193e039ee4dc /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | f347c424613ba34a95120908612b91440f3093c2 (diff) | |
| parent | 2970ad8aeeaa94ad5af5fc49150c14bcf86bf7c9 (diff) | |
| download | rust-0b19a185dbeaad0925480df0bba641749ad2d850.tar.gz rust-0b19a185dbeaad0925480df0bba641749ad2d850.zip | |
Rollup merge of #100460 - cuviper:drop-llvm-12, r=nagisa
Update the minimum external LLVM to 13 With this change, we'll have stable support for LLVM 13 through 15 (pending release). For reference, the previous increase to LLVM 12 was #90175. r? `@nagisa`
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 96d238eda59..f5d676c44e3 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -92,16 +92,6 @@ unsafe fn configure_llvm(sess: &Session) { add("-generate-arange-section", false); } - // Disable the machine outliner by default in LLVM versions 11 and LLVM - // version 12, where it leads to miscompilation. - // - // Ref: - // - https://github.com/rust-lang/rust/issues/85351 - // - https://reviews.llvm.org/D103167 - if llvm_util::get_version() < (13, 0, 0) { - add("-enable-machine-outliner=never", false); - } - match sess.opts.unstable_opts.merge_functions.unwrap_or(sess.target.merge_functions) { MergeFunctions::Disabled | MergeFunctions::Trampolines => {} MergeFunctions::Aliases => { |