Use the target cpu from the target spec on x86_64 when -Ctarget-cpu isn't used

Fixes rust-lang/rustc_codegen_cranelift#1148
This commit is contained in:
bjorn3 2024-05-12 18:57:24 +02:00
parent cba05a7a14
commit df88c11867

View File

@ -331,9 +331,9 @@ fn build_isa(sess: &Session, backend_config: &BackendConfig) -> Arc<dyn TargetIs
sess.dcx().fatal(format!("can't compile for {}: {}", target_triple, err)); sess.dcx().fatal(format!("can't compile for {}: {}", target_triple, err));
}); });
if target_triple.architecture == target_lexicon::Architecture::X86_64 { if target_triple.architecture == target_lexicon::Architecture::X86_64 {
// Don't use "haswell" as the default, as it implies `has_lzcnt`. // Only set the target cpu on x86_64 as Cranelift is missing
// macOS CI is still at Ivy Bridge EP, so `lzcnt` is interpreted as `bsr`. // the target cpu list for most other targets.
builder.enable("nehalem").unwrap(); builder.enable(sess.target.cpu.as_ref()).unwrap();
} }
builder builder
} }