Skip to content

Commit 6f53f3b

Browse files
committed
Disable outline atomics to aarch64-unknown-linux-musl.
This is a functionally equivalent, minimally invasive backport of rust-lang#90044. backport-of: nothing
1 parent ef1a3b9 commit 6f53f3b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

compiler/rustc_codegen_llvm/src/llvm_util.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,10 @@ pub fn llvm_global_features(sess: &Session) -> Vec<String> {
417417
features.extend(sess.opts.cg.target_feature.split(',').flat_map(&filter));
418418

419419
// FIXME: Move outline-atomics to target definition when earliest supported LLVM is 12.
420-
if get_version() >= (12, 0, 0) && sess.target.llvm_target.contains("aarch64-unknown-linux") {
420+
if get_version() >= (12, 0, 0)
421+
&& sess.target.llvm_target.contains("aarch64-unknown-linux")
422+
&& sess.target.llvm_target != "aarch64-unknown-linux-musl"
423+
{
421424
features.push("+outline-atomics".to_string());
422425
}
423426

0 commit comments

Comments
 (0)