From 4b7da6e60dfe6f6d2cfd29b14a828926e3f6cb36 Mon Sep 17 00:00:00 2001 From: Jack May Date: Fri, 27 Mar 2020 19:07:58 -0700 Subject: [PATCH] Bump rBPF version to v0.1.25: Fix Windows build (#9136) automerge --- Cargo.lock | 6 +++--- programs/bpf/Cargo.lock | 8 ++++---- programs/bpf/Cargo.toml | 2 +- programs/bpf_loader/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0166077c71..3439c951da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3741,7 +3741,7 @@ dependencies = [ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "solana-logger 1.1.0", "solana-sdk 1.1.0", - "solana_rbpf 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", + "solana_rbpf 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5079,7 +5079,7 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6650,7 +6650,7 @@ dependencies = [ "checksum solana_libra_vm_cache_map 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "37fa2e1f00a87514cd2169149a5f81a89279703b2523979688d6ef84081a4690" "checksum solana_libra_vm_runtime 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "ff9f8a7b8212dc4ece5d93f2839896e633c34d7463856e4a555cbcb5c67e9c26" "checksum solana_libra_vm_runtime_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "254c23c8f30e7c82ae4dc6694e743400d674c66d371b700eec03378ba994f00b" -"checksum solana_rbpf 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "3e73fe3cf1da0881709bf32e9a22d4894ce5fa317c9a6284c2b5d8c25be000b8" +"checksum solana_rbpf 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "87d4395203039cac872c125dea2534e6b98ae85e28e3f800872a7571ffa87df8" "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 28350a323e..860196e192 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1736,7 +1736,7 @@ dependencies = [ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "solana-logger 1.1.0", "solana-sdk 1.1.0", - "solana_rbpf 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", + "solana_rbpf 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1751,7 +1751,7 @@ dependencies = [ "solana-logger 1.1.0", "solana-runtime 1.1.0", "solana-sdk 1.1.0", - "solana_rbpf 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", + "solana_rbpf 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2091,7 +2091,7 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2963,7 +2963,7 @@ dependencies = [ "checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" -"checksum solana_rbpf 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "3e73fe3cf1da0881709bf32e9a22d4894ce5fa317c9a6284c2b5d8c25be000b8" +"checksum solana_rbpf 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "87d4395203039cac872c125dea2534e6b98ae85e28e3f800872a7571ffa87df8" "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml index 74e8849b60..82ef97d494 100644 --- a/programs/bpf/Cargo.toml +++ b/programs/bpf/Cargo.toml @@ -26,7 +26,7 @@ solana-bpf-loader-program = { path = "../bpf_loader", version = "1.1.0" } solana-logger = { path = "../../logger", version = "1.1.0" } solana-runtime = { path = "../../runtime", version = "1.1.0" } solana-sdk = { path = "../../sdk", version = "1.1.0" } -solana_rbpf = "=0.1.24" +solana_rbpf = "=0.1.25" [[bench]] name = "bpf_loader" diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml index 2c7f05f53a..af816022a0 100644 --- a/programs/bpf_loader/Cargo.toml +++ b/programs/bpf_loader/Cargo.toml @@ -17,7 +17,7 @@ num-derive = { version = "0.3" } num-traits = { version = "0.2" } solana-logger = { path = "../../logger", version = "1.1.0" } solana-sdk = { path = "../../sdk", version = "1.1.0" } -solana_rbpf = "=0.1.24" +solana_rbpf = "=0.1.25" thiserror = "1.0" [lib]