Skip to content

Commit

Permalink
rollup merge of rust-lang#18683 : thestinger/typo
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton committed Nov 6, 2014
2 parents 90bfcec + cfae691 commit 11a4f7b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/librustc/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ fn link_args(cmd: &mut Command,

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_str = String::new();
let args = sess.opts.cg.link_args.as_ref().unwrap_or(&empty_vec);
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_back/target/arm_linux_androideabi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub fn target() -> Target {
// linker doesn't like that by default.
base.pre_link_args.push("-Wl,--allow-multiple-definition".to_string());
// FIXME #17437 (and #17448): Android doesn't support position dependant executables anymore.
base.position_independant_executables = false;
base.position_independent_executables = false;

Target {
data_layout: "e-p:32:32:32\
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_back/target/linux_base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub fn opts() -> TargetOptions {
// follow this flag. Thus, use it before specifying libraries to link to.
"-Wl,--as-needed".to_string(),
),
position_independant_executables: true,
position_independent_executables: true,
.. Default::default()
}
}
4 changes: 2 additions & 2 deletions src/librustc_back/target/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ pub struct TargetOptions {
/// 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
/// 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 {
Expand Down Expand Up @@ -190,7 +190,7 @@ impl Default for TargetOptions {
linker_is_gnu: false,
has_rpath: false,
no_compiler_rt: false,
position_independant_executables: false,
position_independent_executables: false,
}
}
}
Expand Down

0 comments on commit 11a4f7b

Please sign in to comment.