about summary refs log tree commit diff
path: root/src/librustc_codegen_llvm
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2019-04-18 15:01:10 -0700
committerJosh Stone <jistone@redhat.com>2019-04-18 15:01:10 -0700
commiteed3619f8d86e39c67fed33a3acf7a1cb72f3c42 (patch)
treece39e7eb923097974d610cf9f426c0790ff3fb52 /src/librustc_codegen_llvm
parentbf843eb9c2d48a80a5992a5d60858e27269f9575 (diff)
downloadrust-eed3619f8d86e39c67fed33a3acf7a1cb72f3c42.tar.gz
rust-eed3619f8d86e39c67fed33a3acf7a1cb72f3c42.zip
Use -mergefunc-use-aliases for any LLVM >= 8
Diffstat (limited to 'src/librustc_codegen_llvm')
-rw-r--r--src/librustc_codegen_llvm/llvm_util.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs
index 5fea9c8747e..8e3bf553fd9 100644
--- a/src/librustc_codegen_llvm/llvm_util.rs
+++ b/src/librustc_codegen_llvm/llvm_util.rs
@@ -61,7 +61,7 @@ unsafe fn configure_llvm(sess: &Session) {
         if sess.opts.debugging_opts.disable_instrumentation_preinliner {
             add("-disable-preinline");
         }
-        if llvm::LLVMRustIsRustLLVM() {
+        if get_major_version() >= 8 {
             match sess.opts.debugging_opts.merge_functions
                   .unwrap_or(sess.target.target.options.merge_functions) {
                 MergeFunctions::Disabled |