rollup merge of #18683 : thestinger/typo
This commit is contained in:
commit
11a4f7b4c9
4 changed files with 5 additions and 5 deletions
|
@ -920,7 +920,7 @@ fn link_args(cmd: &mut Command,
|
||||||
|
|
||||||
let used_link_args = sess.cstore.get_used_link_args().borrow();
|
let used_link_args = sess.cstore.get_used_link_args().borrow();
|
||||||
|
|
||||||
if t.options.position_independant_executables {
|
if t.options.position_independent_executables {
|
||||||
let empty_vec = Vec::new();
|
let empty_vec = Vec::new();
|
||||||
let empty_str = String::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);
|
||||||
|
|
|
@ -17,7 +17,7 @@ pub fn target() -> Target {
|
||||||
// linker doesn't like that by default.
|
// linker doesn't like that by default.
|
||||||
base.pre_link_args.push("-Wl,--allow-multiple-definition".to_string());
|
base.pre_link_args.push("-Wl,--allow-multiple-definition".to_string());
|
||||||
// FIXME #17437 (and #17448): Android doesn't support position dependant executables anymore.
|
// FIXME #17437 (and #17448): Android doesn't support position dependant executables anymore.
|
||||||
base.position_independant_executables = false;
|
base.position_independent_executables = false;
|
||||||
|
|
||||||
Target {
|
Target {
|
||||||
data_layout: "e-p:32:32:32\
|
data_layout: "e-p:32:32:32\
|
||||||
|
|
|
@ -25,7 +25,7 @@ pub fn opts() -> TargetOptions {
|
||||||
// follow this flag. Thus, use it before specifying libraries to link to.
|
// follow this flag. Thus, use it before specifying libraries to link to.
|
||||||
"-Wl,--as-needed".to_string(),
|
"-Wl,--as-needed".to_string(),
|
||||||
),
|
),
|
||||||
position_independant_executables: true,
|
position_independent_executables: true,
|
||||||
.. Default::default()
|
.. Default::default()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,7 +159,7 @@ pub struct TargetOptions {
|
||||||
/// relocation model of position independent code is not changed. This is a requirement to take
|
/// relocation model of position independent code is not changed. This is a requirement to take
|
||||||
/// advantage of ASLR, as otherwise the functions in the executable are not randomized and can
|
/// advantage of ASLR, as otherwise the functions in the executable are not randomized and can
|
||||||
/// be used during an exploit of a vulnerability in any code.
|
/// be used during an exploit of a vulnerability in any code.
|
||||||
pub position_independant_executables: bool,
|
pub position_independent_executables: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for TargetOptions {
|
impl Default for TargetOptions {
|
||||||
|
@ -190,7 +190,7 @@ impl Default for TargetOptions {
|
||||||
linker_is_gnu: false,
|
linker_is_gnu: false,
|
||||||
has_rpath: false,
|
has_rpath: false,
|
||||||
no_compiler_rt: false,
|
no_compiler_rt: false,
|
||||||
position_independant_executables: false,
|
position_independent_executables: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue