Make BPF Loader static (#11516)

programs/bpf_loader/Cargo.toml

@@ -11,7 +11,6 @@ edition = "2018"
 [dependencies]
 bincode = "1.3.1"
 byteorder = "1.3.4"
-jemalloc-sys = { version = "0.3.2", features = ["disable_initial_exec_tls"] }
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
 solana-runtime = { path = "../../runtime", version = "1.4.0" }
@@ -24,7 +23,7 @@ rand = "0.7.3"
 rustversion = "1.0.3"
 
 [lib]
-crate-type = ["lib", "cdylib"]
+crate-type = ["lib"]
 name = "solana_bpf_loader_program"
 
 [package.metadata.docs.rs]

programs/bpf_loader/src/deprecated.rs

@@ -1,9 +1,6 @@
-use crate::process_instruction;
-
-solana_sdk::declare_loader!(
+solana_sdk::declare_builtin!(
     solana_sdk::bpf_loader_deprecated::ID,
     solana_bpf_loader_deprecated_program,
-    process_instruction,
-    solana_bpf_loader_program,
+    solana_bpf_loader_program::process_instruction,
     deprecated::id
 );

programs/bpf_loader/src/lib.rs

@@ -29,11 +29,10 @@ use solana_sdk::{
 };
 use thiserror::Error;
 
-solana_sdk::declare_loader!(
+solana_sdk::declare_builtin!(
     solana_sdk::bpf_loader::ID,
     solana_bpf_loader_program,
-    process_instruction,
-    solana_bpf_loader_program
+    solana_bpf_loader_program::process_instruction
 );
 
 #[derive(Error, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
@@ -280,15 +279,6 @@ mod tests {
         }
     }
 
-    #[rustversion::since(1.46.0)]
-    #[test]
-    fn test_bpf_loader_same_crate() {
-        // Ensure that we can invoke this macro from the same crate
-        // where it is defined.
-        solana_bpf_loader_program!();
-        solana_bpf_loader_deprecated_program!();
-    }
-
     #[test]
     #[should_panic(expected = "ExceededMaxInstructions(10)")]
     fn test_bpf_loader_non_terminating_program() {