mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #68328 - jethrogb:jb/target-llvm-args, r=alexcrichton

Browse Source 
Actually pass target LLVM args to LLVM

Missed in #68059

r? @alexcrichton
This commit is contained in:
Mazdak Farrokhzad 2020-01-21 19:42:23 +01:00 committed by GitHub
commit 3fa8cc3877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc_codegen_llvm/llvm_util.rs
View File

@ -58,9 +58,10 @@ unsafe fn configure_llvm(sess: &Session) {
let cg_opts = sess.opts.cg.llvm_args.iter();
let tg_opts = sess.target.target.options.llvm_args.iter();
let sess_args = cg_opts.chain(tg_opts);
let user_specified_args: FxHashSet<_> =
cg_opts.chain(tg_opts).map(|s| llvm_arg_to_arg_name(s)).filter(|s| s.len() > 0).collect();
sess_args.clone().map(|s| llvm_arg_to_arg_name(s)).filter(|s| s.len() > 0).collect();
{
// This adds the given argument to LLVM. Unless `force` is true
@ -107,7 +108,7 @@ unsafe fn configure_llvm(sess: &Session) {
// during inlining. Unfortunately these may block other optimizations.
add("-preserve-alignment-assumptions-during-inlining=false", false);
for arg in &sess.opts.cg.llvm_args {
for arg in sess_args {
add(&(*arg), true);
}
}