Skip to content

Commit

Permalink
Rollup merge of rust-lang#62808 - crlf0710:gnux32_stack_probe, r=nikic
Browse files Browse the repository at this point in the history
Revert "Disable stack probing for gnux32."

This reverts commit 42d652e. (rust-lang#59686)

Closes rust-lang#59674.
  • Loading branch information
Mark-Simulacrum committed Jul 23, 2019
2 parents 13775d2 + 10d4159 commit 66c2965
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ pub fn target() -> TargetResult {
base.cpu = "x86-64".to_string();
base.max_atomic_width = Some(64);
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-mx32".to_string());
// BUG: temporarily workaround #59674
base.stack_probes = false;
base.stack_probes = true;
base.has_elf_tls = false;
// BUG(GabrielMajeri): disabling the PLT on x86_64 Linux with x32 ABI
// breaks code gen. See LLVM bug 36743
Expand Down

0 comments on commit 66c2965

Please sign in to comment.