diff options
| author | bors <bors@rust-lang.org> | 2022-11-16 15:55:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-16 15:55:30 +0000 |
| commit | e69336efe035c274f2ee66922cd9cac6015956ea (patch) | |
| tree | 75586b5b6990744696a789341a292c14f7ddcc78 /compiler/rustc_codegen_llvm | |
| parent | 63c748ee23ab7b6706655146f5b7c7f579811803 (diff) | |
| parent | 972ad00094d8405b1188e5a40c1378f2eb073223 (diff) | |
| download | rust-e69336efe035c274f2ee66922cd9cac6015956ea.tar.gz rust-e69336efe035c274f2ee66922cd9cac6015956ea.zip | |
Auto merge of #104492 - matthiaskrgr:rollup-3xyjynz, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- #103750 (Fix some misleading target feature aliases)
- #104137 (Issue error when -C link-self-contained option is used on unsupported platforms)
- #104317 (cleanup and dedupe CTFE and Miri error reporting)
- #104335 (Only do parser recovery on retried macro matching)
- #104394 (various cleanups to try to reduce the use of spans inside method resolution)
- #104459 (rustdoc: remove unused JS IIFE from main.js)
- #104462 (rustdoc: remove pointless CSS `.rightside { padding-right: 2px }`)
- #104466 (rustdoc: remove no-op CSS `#crate-search-div { display: inline-block }`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -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 e1f54356228..4af1aaec0a1 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -163,6 +163,9 @@ pub fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> SmallVec<[&'a str; 2] ("x86", "rdrand") => smallvec!["rdrnd"], ("x86", "bmi1") => smallvec!["bmi"], ("x86", "cmpxchg16b") => smallvec!["cx16"], + // FIXME: These aliases are misleading, and should be removed before avx512_target_feature is + // stabilized. They must remain until std::arch switches off them. + // rust#100752 ("x86", "avx512vaes") => smallvec!["vaes"], ("x86", "avx512gfni") => smallvec!["gfni"], ("x86", "avx512vpclmulqdq") => smallvec!["vpclmulqdq"], |