Bump to rbpf v0.1.34 (#13874)

(cherry picked from commit 7890957)

# Conflicts:
#	Cargo.lock
#	cli/Cargo.toml
#	programs/bpf/Cargo.toml
#	programs/bpf_loader/Cargo.toml

Author: jackcmay

Cargo.lock

@@ -27,6 +27,7 @@ reqwest = { version = "0.10.6", default-features = false, features = ["blocking"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
+<<<<<<< HEAD
 solana-account-decoder = { path = "../account-decoder", version = "1.3.24" }
 solana-budget-program = { path = "../programs/budget", version = "1.3.24" }
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.3.24" }
@@ -47,6 +48,26 @@ solana-transaction-status = { path = "../transaction-status", version = "1.3.24"
 solana-version = { path = "../version", version = "1.3.24" }
 solana-vote-program = { path = "../programs/vote", version = "1.3.24" }
 solana-vote-signer = { path = "../vote-signer", version = "1.3.24" }
+=======
+solana-account-decoder = { path = "../account-decoder", version = "1.4.14" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.4.14" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.14" }
+solana-cli-config = { path = "../cli-config", version = "1.4.14" }
+solana-cli-output = { path = "../cli-output", version = "1.4.14" }
+solana-client = { path = "../client", version = "1.4.14" }
+solana-config-program = { path = "../programs/config", version = "1.4.14" }
+solana-faucet = { path = "../faucet", version = "1.4.14" }
+solana-logger = { path = "../logger", version = "1.4.14" }
+solana-net-utils = { path = "../net-utils", version = "1.4.14" }
+solana_rbpf = "=0.1.34"
+solana-remote-wallet = { path = "../remote-wallet", version = "1.4.14" }
+solana-sdk = { path = "../sdk", version = "1.4.14" }
+solana-stake-program = { path = "../programs/stake", version = "1.4.14" }
+solana-transaction-status = { path = "../transaction-status", version = "1.4.14" }
+solana-version = { path = "../version", version = "1.4.14" }
+solana-vote-program = { path = "../programs/vote", version = "1.4.14" }
+solana-vote-signer = { path = "../vote-signer", version = "1.4.14" }
+>>>>>>> 789095725... Bump to rbpf v0.1.34 (#13874)
 thiserror = "1.0.20"
 tiny-bip39 = "0.7.0"
 url = "2.1.1"

cli/Cargo.toml

@@ -22,12 +22,21 @@ walkdir = "2"
 bincode = "1.1.4"
 byteorder = "1.3.2"
 elf = "0.0.10"
+<<<<<<< HEAD
 solana-bpf-loader-program = { path = "../bpf_loader", version = "1.3.24" }
 solana-logger = { path = "../../logger", version = "1.3.24" }
 solana-measure = { path = "../../measure", version = "1.3.24" }
 solana-runtime = { path = "../../runtime", version = "1.3.24" }
 solana-sdk = { path = "../../sdk", version = "1.3.24" }
 solana_rbpf = "=0.1.32"
+=======
+solana-bpf-loader-program = { path = "../bpf_loader", version = "1.4.14" }
+solana-logger = { path = "../../logger", version = "1.4.14" }
+solana-measure = { path = "../../measure", version = "1.4.14" }
+solana-runtime = { path = "../../runtime", version = "1.4.14" }
+solana-sdk = { path = "../../sdk", version = "1.4.14" }
+solana_rbpf = "=0.1.34"
+>>>>>>> 789095725... Bump to rbpf v0.1.34 (#13874)
 
 [[bench]]
 name = "bpf_loader"

programs/bpf/Cargo.toml

@@ -13,9 +13,15 @@ bincode = "1.3.1"
 byteorder = "1.3.4"
 num-derive = "0.3"
 num-traits = "0.2"
+<<<<<<< HEAD
 solana-runtime = { path = "../../runtime", version = "1.3.24" }
 solana-sdk = { path = "../../sdk", version = "1.3.24" }
 solana_rbpf = "=0.1.32"
+=======
+solana-runtime = { path = "../../runtime", version = "1.4.14" }
+solana-sdk = { path = "../../sdk", version = "1.4.14" }
+solana_rbpf = "=0.1.34"
+>>>>>>> 789095725... Bump to rbpf v0.1.34 (#13874)
 thiserror = "1.0"
 
 [dev-dependencies]