From b34ba0fc4e200e87a5ac0cf135a86f5052814c1f Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 9 Oct 2020 20:44:50 +0000
Subject: [PATCH] Remove skip-no-mangle entirely (bp #12696) (#12708)

* Remove skip-no-mangle entirely (#12696)

(cherry picked from commit 41ad3dd8f048771052b764fd475afe0d51f3fc99)

# Conflicts:
#	account-decoder/Cargo.toml
#	core/Cargo.toml
#	transaction-status/Cargo.toml

* resolve conflicts

Co-authored-by: Jack May <jack@solana.com>
---
 account-decoder/Cargo.toml       | 2 +-
 core/Cargo.toml                  | 2 +-
 sdk/src/entrypoint.rs            | 1 -
 sdk/src/entrypoint_deprecated.rs | 1 -
 transaction-status/Cargo.toml    | 4 ++--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
index e157ebe801..8b99cd334c 100644
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -22,7 +22,7 @@ solana-config-program = { path = "../programs/config", version = "1.3.16" }
 solana-sdk = { path = "../sdk", version = "1.3.16" }
 solana-stake-program = { path = "../programs/stake", version = "1.3.16" }
 solana-vote-program = { path = "../programs/vote", version = "1.3.16" }
-spl-token-v2-0 = { package = "spl-token", version = "2.0.6", features = ["skip-no-mangle"] }
+spl-token-v2-0 = { package = "spl-token", version = "=2.0.6", features = ["skip-no-mangle"] }
 thiserror = "1.0"
 
 [package.metadata.docs.rs]
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 235ef96b00..1c5e6155b5 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -68,7 +68,7 @@ solana-transaction-status = { path = "../transaction-status", version = "1.3.16"
 solana-version = { path = "../version", version = "1.3.16" }
 solana-vote-program = { path = "../programs/vote", version = "1.3.16" }
 solana-vote-signer = { path = "../vote-signer", version = "1.3.16" }
-spl-token-v2-0 = { package = "spl-token", version = "2.0.6", features = ["skip-no-mangle"] }
+spl-token-v2-0 = { package = "spl-token", version = "=2.0.6", features = ["skip-no-mangle"] }
 tempfile = "3.1.0"
 thiserror = "1.0"
 tokio_01 = { version = "0.1", package = "tokio" }
diff --git a/sdk/src/entrypoint.rs b/sdk/src/entrypoint.rs
index 0c3bc0a362..598e6618c5 100644
--- a/sdk/src/entrypoint.rs
+++ b/sdk/src/entrypoint.rs
@@ -36,7 +36,6 @@ pub const SUCCESS: u64 = 0;
 macro_rules! entrypoint {
     ($process_instruction:ident) => {
         /// # Safety
-        #[cfg(not(feature = "skip-no-mangle"))]
         #[no_mangle]
         pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 {
             let (program_id, accounts, instruction_data) =
diff --git a/sdk/src/entrypoint_deprecated.rs b/sdk/src/entrypoint_deprecated.rs
index ac403ac8fb..278bb75dcb 100644
--- a/sdk/src/entrypoint_deprecated.rs
+++ b/sdk/src/entrypoint_deprecated.rs
@@ -37,7 +37,6 @@ pub const SUCCESS: u64 = 0;
 macro_rules! entrypoint_deprecated {
     ($process_instruction:ident) => {
         /// # Safety
-        #[cfg(not(feature = "skip-no-mangle"))]
         #[no_mangle]
         pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 {
             let (program_id, accounts, instruction_data) =
diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml
index e40b142d12..e318e61e58 100644
--- a/transaction-status/Cargo.toml
+++ b/transaction-status/Cargo.toml
@@ -18,8 +18,8 @@ solana-account-decoder = { path = "../account-decoder", version = "1.3.16" }
 solana-sdk = { path = "../sdk", version = "1.3.16" }
 solana-stake-program = { path = "../programs/stake", version = "1.3.16" }
 solana-vote-program = { path = "../programs/vote", version = "1.3.16" }
-spl-memo-v1-0 = { package = "spl-memo", version = "1.0.7", features = ["skip-no-mangle"] }
-spl-token-v2-0 = { package = "spl-token", version = "2.0.6", features = ["skip-no-mangle"] }
+spl-memo-v1-0 = { package = "spl-memo", version = "=1.0.7", features = ["skip-no-mangle"] }
+spl-token-v2-0 = { package = "spl-token", version = "=2.0.6", features = ["skip-no-mangle"] }
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"