diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 7488cb59830..58266f2ea32 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -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); diff --git a/src/librustc_back/target/arm_linux_androideabi.rs b/src/librustc_back/target/arm_linux_androideabi.rs index b47e3d0b237..97bc747916d 100644 --- a/src/librustc_back/target/arm_linux_androideabi.rs +++ b/src/librustc_back/target/arm_linux_androideabi.rs @@ -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\ diff --git a/src/librustc_back/target/linux_base.rs b/src/librustc_back/target/linux_base.rs index 51b817a6175..d267bc77e49 100644 --- a/src/librustc_back/target/linux_base.rs +++ b/src/librustc_back/target/linux_base.rs @@ -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() } } diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index 2801682239b..d7b4285cdb0 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -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 { @@ -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, } } }