diff options
| author | bors <bors@rust-lang.org> | 2024-06-15 14:51:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-15 14:51:12 +0000 |
| commit | 92af831290cf60434aa44ba7c6a5171ec48e98be (patch) | |
| tree | 7dfa32a67d68561f3183e2b28a43ac8e030db190 /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | 687a68d67953eddd0a4bd415b8f7fee679e66595 (diff) | |
| parent | 128e2b479c8681a236071a1b84b5f0f751c4cc4d (diff) | |
| download | rust-92af831290cf60434aa44ba7c6a5171ec48e98be.tar.gz rust-92af831290cf60434aa44ba7c6a5171ec48e98be.zip | |
Auto merge of #126518 - matthiaskrgr:rollup-wb70rzq, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #125829 (rustc_span: Add conveniences for working with span formats) - #126361 (Unify intrinsics body handling in StableMIR) - #126417 (Add `f16` and `f128` inline ASM support for `x86` and `x86-64`) - #126424 ( Also sort `crt-static` in `--print target-features` output) - #126428 (Polish `std::path::absolute` documentation.) - #126429 (Add `f16` and `f128` const eval for binary and unary operationations) - #126448 (End support for Python 3.8 in tidy) - #126488 (Use `std::path::absolute` in bootstrap) - #126511 (.mailmap: Associate both my work and my private email with me) 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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 53b9b530e9b..7e0f264a4ae 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -394,10 +394,15 @@ fn print_target_features(out: &mut dyn PrintBackendInfo, sess: &Session, tm: &ll (*feature, desc) }) .collect::<Vec<_>>(); + + // Since we add this at the end ... rustc_target_features.extend_from_slice(&[( "crt-static", "Enables C Run-time Libraries to be statically linked", )]); + // ... we need to sort the list again. + rustc_target_features.sort(); + llvm_target_features.retain(|(f, _d)| !known_llvm_target_features.contains(f)); let max_feature_len = llvm_target_features |
