mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #40245 - cuviper:maybe-not-pie, r=alexcrichton

Browse source 
Let `-Crelocation-model` better control `-pie` linking

Prior to this, if relocation model in the target options was "pic", as
most targets have it, then the user's `-Crelocation-model` had no effect
on whether `-pie` would be used.  Only `-Clink-arg=-static` would have a
further override here.

Now we use `context::get_reloc_model`, which gives precedence to the
user's option, and if it's `RelocMode::PIC` we enable `-pie`.  This is
the same test as `context::is_pie_binary`, except that folds across all
`sess.crate_types`, not just the current one.

Fixes #35061.
This commit is contained in:
bors 2017-03-04 12:33:35 +00:00
commit 27918f32ad
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_trans/back/link.rs
View file

@ -31,6 +31,8 @@ use rustc::hir::svh::Svh;
use rustc_back::tempdir::TempDir; use rustc_back::tempdir::TempDir;
use rustc_back::PanicStrategy; use rustc_back::PanicStrategy;
use rustc_incremental::IncrementalHashesMap; use rustc_incremental::IncrementalHashesMap;
use context::get_reloc_model;
use llvm;
use std::ascii; use std::ascii;
use std::char; use std::char;
@ -859,13 +861,11 @@ fn link_args(cmd: &mut Linker,
if crate_type == config::CrateTypeExecutable && if crate_type == config::CrateTypeExecutable &&
t.options.position_independent_executables { t.options.position_independent_executables {
let empty_vec = Vec::new(); let empty_vec = Vec::new();
let empty_str = String::new();
let args = sess.opts.cg.link_args.as_ref().unwrap_or(&empty_vec); let args = sess.opts.cg.link_args.as_ref().unwrap_or(&empty_vec);
let more_args = &sess.opts.cg.link_arg; let more_args = &sess.opts.cg.link_arg;
let mut args = args.iter().chain(more_args.iter()).chain(used_link_args.iter()); let mut args = args.iter().chain(more_args.iter()).chain(used_link_args.iter());
let relocation_model = sess.opts.cg.relocation_model.as_ref()
.unwrap_or(&empty_str); if get_reloc_model(sess) == llvm::RelocMode::PIC
if (t.options.relocation_model == "pic" || *relocation_model == "pic")
&& !args.any(|x| *x == "-static") { && !args.any(|x| *x == "-static") {
cmd.position_independent_executable(); cmd.position_independent_executable();
} }