diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-07-23 12:51:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 12:51:10 -0400 |
| commit | 66c2965ac2ca3d1a5d14992046c787a5aedf2c24 (patch) | |
| tree | f074de71d746a5163f2a56be02945084bc1a63ca | |
| parent | 13775d23048426dd7223a3393fe7ad8fc44024ea (diff) | |
| parent | 10d415938ed8d87aa5cda7ef23680a16bcad288b (diff) | |
| download | rust-66c2965ac2ca3d1a5d14992046c787a5aedf2c24.tar.gz rust-66c2965ac2ca3d1a5d14992046c787a5aedf2c24.zip | |
Rollup merge of #62808 - crlf0710:gnux32_stack_probe, r=nikic
Revert "Disable stack probing for gnux32." This reverts commit 42d652ecd6709b756d95fc42615b166aacd2ea07. (#59686) Closes #59674.
| -rw-r--r-- | src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs b/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs index 73151b194de..0b2d7aacc4d 100644 --- a/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs +++ b/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs @@ -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 |