diff options
| author | bors <bors@rust-lang.org> | 2021-03-23 16:14:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-23 16:14:31 +0000 |
| commit | 2fd73fabe469357a12c2c974c140f67e7cdd76d0 (patch) | |
| tree | d1bbe2dbe40888fcdeac8a0cc1f0ec98cefda590 /compiler/rustc_target/src/spec/i686_linux_android.rs | |
| parent | 9bb6d54577665fb3abb6cf27c40ed5247ff3fc7f (diff) | |
| parent | b75894e9bba348763862810e300a33e15cff326d (diff) | |
| download | rust-2fd73fabe469357a12c2c974c140f67e7cdd76d0.tar.gz rust-2fd73fabe469357a12c2c974c140f67e7cdd76d0.zip | |
Auto merge of #83412 - pnkfelix:stable-revert-effect-of-pr-77885-for-issue-83139, r=nagisa 1.51.0
[stable] probe-stack=call everywhere again, for now. To buy time on issue 83139, revert effect of PR 77885: We will not conditionally enable probe-stack=inline-asm on LLVM 11+ anymore on any of our targets that opted into doing so on PR #77885 (and were subsequently configured to do so in a fine grained manner on PR #80838). After we resolve 83139 (potentially by backporting a fix to LLVM, or potentially by deciding that one cannot rely on the quality of our DWARF output in the manner described in issue 83139), we can change this back. cc #83139
Diffstat (limited to 'compiler/rustc_target/src/spec/i686_linux_android.rs')
| -rw-r--r-- | compiler/rustc_target/src/spec/i686_linux_android.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_target/src/spec/i686_linux_android.rs b/compiler/rustc_target/src/spec/i686_linux_android.rs index 18cd8847abd..89eb41e3cba 100644 --- a/compiler/rustc_target/src/spec/i686_linux_android.rs +++ b/compiler/rustc_target/src/spec/i686_linux_android.rs @@ -11,7 +11,8 @@ pub fn target() -> Target { // http://developer.android.com/ndk/guides/abis.html#x86 base.cpu = "pentiumpro".to_string(); base.features = "+mmx,+sse,+sse2,+sse3,+ssse3".to_string(); - base.stack_probes = StackProbeType::InlineOrCall { min_llvm_version_for_inline: (11, 0, 1) }; + // don't use probe-stack=inline-asm until rust-lang/rust#83139 is resolved. + base.stack_probes = StackProbeType::Call; Target { llvm_target: "i686-linux-android".to_string(), |