@ -1,15 +1,8 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
use solana_runtime::{
|
use solana_runtime::{
|
||||||
bank::{Builtin, Builtins},
|
bank::{Builtin, Builtins},
|
||||||
builtins::ActivationType,
|
builtins::ActivationType,
|
||||||
};
|
};
|
||||||
use solana_sdk::{feature_set, pubkey::Pubkey};
|
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 {
|
macro_rules! to_builtin {
|
||||||
($b:expr) => {
|
($b:expr) => {
|
||||||
@ -23,12 +16,7 @@ fn genesis_builtins(bpf_jit: bool) -> Vec<Builtin> {
|
|||||||
// !x86_64: https://github.com/qmonnet/rbpf/issues/48
|
// !x86_64: https://github.com/qmonnet/rbpf/issues/48
|
||||||
// Windows: https://github.com/solana-labs/rbpf/issues/217
|
// Windows: https://github.com/solana-labs/rbpf/issues/217
|
||||||
#[cfg(any(not(target_arch = "x86_64"), target_family = "windows"))]
|
#[cfg(any(not(target_arch = "x86_64"), target_family = "windows"))]
|
||||||
let bpf_jit = {
|
let bpf_jit = false;
|
||||||
if bpf_jit {
|
|
||||||
info!("BPF JIT is not supported on this target");
|
|
||||||
}
|
|
||||||
false
|
|
||||||
};
|
|
||||||
|
|
||||||
vec![
|
vec![
|
||||||
to_builtin!(solana_bpf_loader_deprecated_program!()),
|
to_builtin!(solana_bpf_loader_deprecated_program!()),
|
||||||
|
Reference in New Issue
Block a user