From 9bf07ee2068a87a25e6f4c0bf330ab7d06400edb Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Fri, 20 May 2022 12:51:23 +1000
Subject: [PATCH] More target_arch = "bpf" => target_os = "solana"

Continuing the work started in https://github.com/solana-labs/solana/pull/25358
---
 docs/src/developing/on-chain-programs/developing-rust.md | 4 ++--
 frozen-abi/Cargo.toml                                    | 9 ++++++---
 programs/address-lookup-table/Cargo.toml                 | 2 +-
 sdk/program/Cargo.toml                                   | 4 ++--
 zk-token-sdk/Cargo.toml                                  | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/docs/src/developing/on-chain-programs/developing-rust.md b/docs/src/developing/on-chain-programs/developing-rust.md
index a13411e8a4..ee948933cc 100644
--- a/docs/src/developing/on-chain-programs/developing-rust.md
+++ b/docs/src/developing/on-chain-programs/developing-rust.md
@@ -330,7 +330,7 @@ custom-panic = []
 Then provide a custom implementation of the panic handler:
 
 ```rust
-#[cfg(all(feature = "custom-panic", target_arch = "bpf"))]
+#[cfg(all(feature = "custom-panic", target_os = "solana"))]
 #[no_mangle]
 fn custom_panic(info: &core::panic::PanicInfo<'_>) {
     solana_program::msg!("program custom panic enabled");
@@ -351,7 +351,7 @@ programs can provide their own custom panic handler with an empty
 implementation.
 
 ```rust
-#[cfg(all(feature = "custom-panic", target_arch = "bpf"))]
+#[cfg(all(feature = "custom-panic", target_os = "solana"))]
 #[no_mangle]
 fn custom_panic(info: &core::panic::PanicInfo<'_>) {
     // Do nothing to save space
diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml
index fb8de57e8b..1b82a34578 100644
--- a/frozen-abi/Cargo.toml
+++ b/frozen-abi/Cargo.toml
@@ -21,12 +21,15 @@ sha2 = "0.10.2"
 solana-frozen-abi-macro = { path = "macro", version = "=1.11.0" }
 thiserror = "1.0"
 
-[target.'cfg(not(target_arch = "bpf"))'.dependencies]
-generic-array = { version = "0.14.5", default-features = false, features = ["serde", "more_lengths"] }
+[target.'cfg(not(target_os = "solana"))'.dependencies]
+generic-array = { version = "0.14.5", default-features = false, features = [
+	"serde",
+	"more_lengths"
+] }
 im = { version = "15.1.0", features = ["rayon", "serde"] }
 memmap2 = "0.5.3"
 
-[target.'cfg(not(target_arch = "bpf"))'.dev-dependencies]
+[target.'cfg(not(target_os = "solana"))'.dev-dependencies]
 solana-logger = { path = "../logger", version = "=1.11.0" }
 
 [build-dependencies]
diff --git a/programs/address-lookup-table/Cargo.toml b/programs/address-lookup-table/Cargo.toml
index 56fcfd6837..8cf3787945 100644
--- a/programs/address-lookup-table/Cargo.toml
+++ b/programs/address-lookup-table/Cargo.toml
@@ -21,7 +21,7 @@ solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.11.0"
 solana-program = { path = "../../sdk/program", version = "=1.11.0" }
 thiserror = "1.0"
 
-[target.'cfg(not(target_arch = "bpf"))'.dependencies]
+[target.'cfg(not(target_os = "solana"))'.dependencies]
 solana-program-runtime = { path = "../../program-runtime", version = "=1.11.0" }
 solana-sdk = { path = "../../sdk", version = "=1.11.0" }
 
diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
index 8b9997ccdc..48f989c34d 100644
--- a/sdk/program/Cargo.toml
+++ b/sdk/program/Cargo.toml
@@ -35,7 +35,7 @@ solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.11.0"
 solana-sdk-macro = { path = "../macro", version = "=1.11.0" }
 thiserror = "1.0"
 
-[target.'cfg(not(target_arch = "bpf"))'.dependencies]
+[target.'cfg(not(target_os = "solana"))'.dependencies]
 bitflags = "1.3.1"
 base64 = "0.13"
 curve25519-dalek = "3.2.1"
@@ -44,7 +44,7 @@ rand = "0.7.0"
 itertools = "0.10.1"
 wasm-bindgen = "0.2"
 
-[target.'cfg(not(target_arch = "bpf"))'.dev-dependencies]
+[target.'cfg(not(target_os = "solana"))'.dev-dependencies]
 solana-logger = { path = "../../logger", version = "=1.11.0" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/zk-token-sdk/Cargo.toml b/zk-token-sdk/Cargo.toml
index 06a83b318d..3846181403 100644
--- a/zk-token-sdk/Cargo.toml
+++ b/zk-token-sdk/Cargo.toml
@@ -14,7 +14,7 @@ num-derive = "0.3"
 num-traits = "0.2"
 solana-program = { path = "../sdk/program", version = "=1.11.0" }
 
-[target.'cfg(not(target_arch = "bpf"))'.dependencies]
+[target.'cfg(not(target_os = "solana"))'.dependencies]
 aes-gcm-siv = "0.10.3"
 arrayref = "0.3.6"
 bincode = "1"