From 9dad9c6333747a101dd9ca8b8cd0363c2e76d8c1 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 22:47:17 +0000 Subject: [PATCH] Prevent stub inclusion when building shared objects (bp #10875) (#10879) * Prevent stub inclusion when building shared objects (#10875) (cherry picked from commit 52526a9bc24b8ede837772e72a200127761f3eaf) # Conflicts: # programs/bpf/rust/128bit/src/lib.rs # programs/bpf/rust/alloc/src/lib.rs # programs/bpf/rust/dep_crate/src/lib.rs # programs/bpf/rust/invoke/src/lib.rs # programs/bpf/rust/invoked/src/lib.rs # programs/bpf/rust/iter/src/lib.rs # programs/bpf/rust/many_args/src/lib.rs # programs/bpf/rust/many_args_dep/src/lib.rs # programs/bpf/rust/noop/src/lib.rs # programs/bpf/rust/param_passing/src/lib.rs # programs/bpf/rust/param_passing_dep/src/lib.rs # sdk/bpf/rust/test/src/lib.rs * nudge Co-authored-by: Jack May --- programs/bpf/rust/128bit/src/lib.rs | 2 +- programs/bpf/rust/alloc/src/lib.rs | 2 +- programs/bpf/rust/dep_crate/src/lib.rs | 2 +- programs/bpf/rust/invoke/src/lib.rs | 1 + programs/bpf/rust/invoked/src/lib.rs | 1 + programs/bpf/rust/iter/src/lib.rs | 2 +- programs/bpf/rust/many_args/src/lib.rs | 2 +- programs/bpf/rust/many_args_dep/src/lib.rs | 2 +- programs/bpf/rust/noop/src/lib.rs | 2 +- programs/bpf/rust/param_passing/src/lib.rs | 2 +- programs/bpf/rust/param_passing_dep/src/lib.rs | 2 +- sdk/bpf/rust/test/Cargo.toml | 15 --------------- 12 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 sdk/bpf/rust/test/Cargo.toml diff --git a/programs/bpf/rust/128bit/src/lib.rs b/programs/bpf/rust/128bit/src/lib.rs index d142f05ca2..7d8fa04782 100644 --- a/programs/bpf/rust/128bit/src/lib.rs +++ b/programs/bpf/rust/128bit/src/lib.rs @@ -53,7 +53,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 { #[cfg(test)] mod test { use super::*; - // Pulls in the stubs required for `info!()` + // Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); #[test] diff --git a/programs/bpf/rust/alloc/src/lib.rs b/programs/bpf/rust/alloc/src/lib.rs index 3f1a3f483a..e864a5948b 100644 --- a/programs/bpf/rust/alloc/src/lib.rs +++ b/programs/bpf/rust/alloc/src/lib.rs @@ -85,7 +85,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 { #[cfg(test)] mod test { use super::*; - // Pulls in the stubs required for `info!()` + // Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); #[test] diff --git a/programs/bpf/rust/dep_crate/src/lib.rs b/programs/bpf/rust/dep_crate/src/lib.rs index cd2b3d2387..8321c27d42 100644 --- a/programs/bpf/rust/dep_crate/src/lib.rs +++ b/programs/bpf/rust/dep_crate/src/lib.rs @@ -20,7 +20,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 { #[cfg(test)] mod test { use super::*; - // Pulls in the stubs required for `info!()` + // Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); #[test] diff --git a/programs/bpf/rust/invoke/src/lib.rs b/programs/bpf/rust/invoke/src/lib.rs index 0816b1252c..12c23b09ef 100644 --- a/programs/bpf/rust/invoke/src/lib.rs +++ b/programs/bpf/rust/invoke/src/lib.rs @@ -201,4 +201,5 @@ fn process_instruction( Ok(()) } +// Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); diff --git a/programs/bpf/rust/invoked/src/lib.rs b/programs/bpf/rust/invoked/src/lib.rs index 95db3140c1..e48b42c841 100644 --- a/programs/bpf/rust/invoked/src/lib.rs +++ b/programs/bpf/rust/invoked/src/lib.rs @@ -192,4 +192,5 @@ fn process_instruction( Ok(()) } +// Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); diff --git a/programs/bpf/rust/iter/src/lib.rs b/programs/bpf/rust/iter/src/lib.rs index c5f7b5b829..501f6e5741 100644 --- a/programs/bpf/rust/iter/src/lib.rs +++ b/programs/bpf/rust/iter/src/lib.rs @@ -21,7 +21,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 { #[cfg(test)] mod test { use super::*; - // Pulls in the stubs required for `info!()` + // Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); #[test] diff --git a/programs/bpf/rust/many_args/src/lib.rs b/programs/bpf/rust/many_args/src/lib.rs index 1e57b55a08..1b220ac72a 100644 --- a/programs/bpf/rust/many_args/src/lib.rs +++ b/programs/bpf/rust/many_args/src/lib.rs @@ -29,7 +29,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 { #[cfg(test)] mod test { use super::*; - // Pulls in the stubs required for `info!()` + // Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); #[test] diff --git a/programs/bpf/rust/many_args_dep/src/lib.rs b/programs/bpf/rust/many_args_dep/src/lib.rs index 66025da29d..98e8799cdf 100644 --- a/programs/bpf/rust/many_args_dep/src/lib.rs +++ b/programs/bpf/rust/many_args_dep/src/lib.rs @@ -51,7 +51,7 @@ pub fn many_args_sret( #[cfg(test)] mod test { use super::*; - // Pulls in the stubs required for `info!()` + // Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); #[test] diff --git a/programs/bpf/rust/noop/src/lib.rs b/programs/bpf/rust/noop/src/lib.rs index 0ae7de8f6a..6b196acde5 100644 --- a/programs/bpf/rust/noop/src/lib.rs +++ b/programs/bpf/rust/noop/src/lib.rs @@ -67,7 +67,7 @@ fn process_instruction( #[cfg(test)] mod test { use super::*; - // Pulls in the stubs required for `info!()` + // Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); #[test] diff --git a/programs/bpf/rust/param_passing/src/lib.rs b/programs/bpf/rust/param_passing/src/lib.rs index 44fc9f009f..5968b1bd12 100644 --- a/programs/bpf/rust/param_passing/src/lib.rs +++ b/programs/bpf/rust/param_passing/src/lib.rs @@ -26,7 +26,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 { #[cfg(test)] mod test { use super::*; - // Pulls in the stubs required for `info!()` + // Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); #[test] diff --git a/programs/bpf/rust/param_passing_dep/src/lib.rs b/programs/bpf/rust/param_passing_dep/src/lib.rs index ff5e9e4ae4..70e6fd5827 100644 --- a/programs/bpf/rust/param_passing_dep/src/lib.rs +++ b/programs/bpf/rust/param_passing_dep/src/lib.rs @@ -27,7 +27,7 @@ impl<'a> TestDep { #[cfg(test)] mod test { use super::*; - // Pulls in the stubs required for `info!()` + // Pull in syscall stubs when building for non-BPF targets solana_sdk::program_stubs!(); #[test] diff --git a/sdk/bpf/rust/test/Cargo.toml b/sdk/bpf/rust/test/Cargo.toml deleted file mode 100644 index 51648f79c0..0000000000 --- a/sdk/bpf/rust/test/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "solana-sdk-bpf-test" -version = "1.2.9" -description = "Solana BPF SDK test utilities" -authors = ["Solana Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solana.com/" -edition = "2018" - -[workspace] -members = [] - -[package.metadata.docs.rs] -targets = ["x86_64-unknown-linux-gnu"]