Use -mergefunc-use-aliases for any LLVM >= 8

cuviper · cuviper · commit eed3619f8d86 · 2019-04-18T15:01:10.000-07:00
diff --git 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 |

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ unsafe fn configure_llvm(sess: &Session) {`
`61`	`61`	`if sess.opts.debugging_opts.disable_instrumentation_preinliner {`
`62`	`62`	`add("-disable-preinline");`
`63`	`63`	`}`
`64`		`- if llvm::LLVMRustIsRustLLVM() {`
	`64`	`+ if get_major_version() >= 8 {`
`65`	`65`	`match sess.opts.debugging_opts.merge_functions`
`66`	`66`	`.unwrap_or(sess.target.target.options.merge_functions) {`
`67`	`67`	`MergeFunctions::Disabled \|`