Bump to rbpf v0.1.34 (bp #13874) (#13878)

mergify[bot] · jackcmay · web-flow · commit 3318772bfe6b · 2020-12-01T08:14:21.000Z
* 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 * Resolve conflicts Co-authored-by: Jack May <jack@solana.com>
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -38,7 +38,7 @@ solana-config-program = { path = "../programs/config", version = "1.3.24" }
 solana-faucet = { path = "../faucet", version = "1.3.24" }
 solana-logger = { path = "../logger", version = "1.3.24" }
 solana-net-utils = { path = "../net-utils", version = "1.3.24" }
-solana_rbpf = "=0.1.32"
+solana_rbpf = "=0.1.34"
 solana-remote-wallet = { path = "../remote-wallet", version = "1.3.24" }
 solana-runtime = { path = "../runtime", version = "1.3.24" }
 solana-sdk = { path = "../sdk", version = "1.3.24" }
diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml
@@ -27,7 +27,7 @@ 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_rbpf = "=0.1.34"
 
 [[bench]]
 name = "bpf_loader"
diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
@@ -15,7 +15,7 @@ num-derive = "0.3"
 num-traits = "0.2"
 solana-runtime = { path = "../../runtime", version = "1.3.24" }
 solana-sdk = { path = "../../sdk", version = "1.3.24" }
-solana_rbpf = "=0.1.32"
+solana_rbpf = "=0.1.34"
 thiserror = "1.0"
 
 [dev-dependencies]
