diff options
| author | bors <bors@rust-lang.org> | 2024-11-06 01:21:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-06 01:21:42 +0000 |
| commit | a69df72bdc58742281d17cc3bed2947de70c1482 (patch) | |
| tree | ed73ae4d461da316046e026ed2d283e3f8a6a92c /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | 4a91ff6bb5f36a94d8ebebd9cad1f5f831abbe7a (diff) | |
| parent | 92c1ad8c73a0fcedde2438187d6cb62056876cdd (diff) | |
| download | rust-a69df72bdc58742281d17cc3bed2947de70c1482.tar.gz rust-a69df72bdc58742281d17cc3bed2947de70c1482.zip | |
Auto merge of #132664 - matthiaskrgr:rollup-i27nr7i, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #131261 (Stabilize `UnsafeCell::from_mut`) - #131405 (bootstrap/codegen_ssa: ship llvm-strip and use it for -Cstrip) - #132077 (Add a new `wide-arithmetic` feature for WebAssembly) - #132562 (Remove the `wasm32-wasi` target from rustc) - #132660 (Remove unused errs.rs file) Failed merges: - #131721 (Add new unstable feature `const_eq_ignore_ascii_case`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 6747999dc6f..6f2d86cc601 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -277,6 +277,9 @@ pub(crate) fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> Option<LLVMFea ("x86", s) if s.starts_with("avx512") => { Some(LLVMFeature::with_dependency(s, TargetFeatureFoldStrength::EnableOnly("evex512"))) } + // Support for `wide-arithmetic` will first land in LLVM 20 as part of + // llvm/llvm-project#111598 + ("wasm32" | "wasm64", "wide-arithmetic") if get_version() < (20, 0, 0) => None, (_, s) => Some(LLVMFeature::new(s)), } } |
