From e02ffdf7956b3a36b2e45ada9e8dc2e3ab302c4f Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sat, 25 Jul 2020 16:15:42 +0200
Subject: [PATCH] Use nehalem instead of haswell as target cpu

---
 src/lib.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index 0376672fba7a..38ff7e90b3b1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -320,7 +320,9 @@ fn build_isa(sess: &Session, enable_pic: bool) -> Box<dyn isa::TargetIsa + 'stat
     let flags = settings::Flags::new(flags_builder);
 
     let mut isa_builder = cranelift_codegen::isa::lookup(target_triple).unwrap();
-    isa_builder.enable("haswell").unwrap();
+    // Don't use "haswell", as it implies `has_lzcnt`.macOS CI is still at Ivy Bridge EP, so `lzcnt`
+    // is interpreted as `bsr`.
+    isa_builder.enable("nehalem").unwrap();
     isa_builder.finish(flags)
 }