Skip to content

Commit 11a4f7b

Browse files
committed
rollup merge of rust-lang#18683 : thestinger/typo
2 parents 90bfcec + cfae691 commit 11a4f7b

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/librustc/back/link.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ fn link_args(cmd: &mut Command,
920920

921921
let used_link_args = sess.cstore.get_used_link_args().borrow();
922922

923-
if t.options.position_independant_executables {
923+
if t.options.position_independent_executables {
924924
let empty_vec = Vec::new();
925925
let empty_str = String::new();
926926
let args = sess.opts.cg.link_args.as_ref().unwrap_or(&empty_vec);

src/librustc_back/target/arm_linux_androideabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717
// linker doesn't like that by default.
1818
base.pre_link_args.push("-Wl,--allow-multiple-definition".to_string());
1919
// FIXME #17437 (and #17448): Android doesn't support position dependant executables anymore.
20-
base.position_independant_executables = false;
20+
base.position_independent_executables = false;
2121

2222
Target {
2323
data_layout: "e-p:32:32:32\

src/librustc_back/target/linux_base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn opts() -> TargetOptions {
2525
// follow this flag. Thus, use it before specifying libraries to link to.
2626
"-Wl,--as-needed".to_string(),
2727
),
28-
position_independant_executables: true,
28+
position_independent_executables: true,
2929
.. Default::default()
3030
}
3131
}

src/librustc_back/target/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ pub struct TargetOptions {
159159
/// relocation model of position independent code is not changed. This is a requirement to take
160160
/// advantage of ASLR, as otherwise the functions in the executable are not randomized and can
161161
/// be used during an exploit of a vulnerability in any code.
162-
pub position_independant_executables: bool,
162+
pub position_independent_executables: bool,
163163
}
164164

165165
impl Default for TargetOptions {
@@ -190,7 +190,7 @@ impl Default for TargetOptions {
190190
linker_is_gnu: false,
191191
has_rpath: false,
192192
no_compiler_rt: false,
193-
position_independant_executables: false,
193+
position_independent_executables: false,
194194
}
195195
}
196196
}

0 commit comments

Comments
 (0)