diff options
| author | bors <bors@rust-lang.org> | 2021-11-29 19:26:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-29 19:26:50 +0000 |
| commit | f1edd0429582dd29cccacaf50fd134b05593bd9c (patch) | |
| tree | fc7c7d5cf467d21e4a0c1dade1f4ffad3dbd1b6f /compiler/rustc_codegen_llvm | |
| parent | 7e15b235f62dce8a21e51c2eff6b2c0cde9b018e (diff) | |
| parent | a9174cf94e72378d7aa8c5eb4fb9d85f392c00df (diff) | |
| download | rust-f1edd0429582dd29cccacaf50fd134b05593bd9c.tar.gz rust-f1edd0429582dd29cccacaf50fd134b05593bd9c.zip | |
Auto merge of #91361 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.57.0
[stable] 1.57.0 artifacts This is the standard beta->stable promotion, and includes a last-minute backports of: * #90044 via inclusion of #91220. * [beta] Don't treat unnormalized function arguments as well-formed #91242 r? `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index b15efcd0dc2..c2136f16120 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -417,7 +417,10 @@ pub fn llvm_global_features(sess: &Session) -> Vec<String> { features.extend(sess.opts.cg.target_feature.split(',').flat_map(&filter)); // FIXME: Move outline-atomics to target definition when earliest supported LLVM is 12. - if get_version() >= (12, 0, 0) && sess.target.llvm_target.contains("aarch64-unknown-linux") { + if get_version() >= (12, 0, 0) + && sess.target.llvm_target.contains("aarch64-unknown-linux") + && sess.target.llvm_target != "aarch64-unknown-linux-musl" + { features.push("+outline-atomics".to_string()); } |