From 713b61677e550fdda1f74c93c507a5211f09aa1a Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 29 Nov 2021 19:34:56 -0800
Subject: [PATCH] Quash M1 build warning

(cherry picked from commit e31b469f56adbad59bbb82835072030fef52412f)

# Conflicts:
#	ledger/src/builtins.rs
---
 ledger/src/builtins.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ledger/src/builtins.rs b/ledger/src/builtins.rs
index 16a55e4bca..6e8d8f090b 100644
--- a/ledger/src/builtins.rs
+++ b/ledger/src/builtins.rs
@@ -1,8 +1,15 @@
+<<<<<<< HEAD
 use solana_runtime::{
     bank::{Builtin, Builtins},
     builtins::ActivationType,
 };
 use solana_sdk::{feature_set, pubkey::Pubkey};
+=======
+use {
+    solana_runtime::builtins::{ActivationType, Builtin, Builtins},
+    solana_sdk::pubkey::Pubkey,
+};
+>>>>>>> e31b469f5 (Quash M1 build warning)
 
 macro_rules! to_builtin {
     ($b:expr) => {
@@ -16,7 +23,12 @@ fn genesis_builtins(bpf_jit: bool) -> Vec<Builtin> {
     // !x86_64: https://github.com/qmonnet/rbpf/issues/48
     // Windows: https://github.com/solana-labs/rbpf/issues/217
     #[cfg(any(not(target_arch = "x86_64"), target_family = "windows"))]
-    let bpf_jit = false;
+    let bpf_jit = {
+        if bpf_jit {
+            info!("BPF JIT is not supported on this target");
+        }
+        false
+    };
 
     vec![
         to_builtin!(solana_bpf_loader_deprecated_program!()),