From 7d61935bf131de27ddcb40d90787199b95d65c9c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 23 Dec 2021 03:38:04 +0000
Subject: [PATCH] Bump bpf-tools to v1.21 (#22083)

(cherry picked from commit 7cc6262b5af211a04f85c38e2c906e9ba2f0ddf4)

Co-authored-by: Dmitri Makarov <dmakarov@alumni.stanford.edu>
---
 programs/bpf/tests/programs.rs  | 2 +-
 sdk/bpf/scripts/install.sh      | 2 +-
 sdk/cargo-build-bpf/src/main.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index 7a41fec56c..8222f33f47 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1399,7 +1399,7 @@ fn assert_instruction_count() {
             ("solana_bpf_rust_param_passing", 146),
             ("solana_bpf_rust_rand", 488),
             ("solana_bpf_rust_sanity", 8455),
-            ("solana_bpf_rust_secp256k1_recover", 25216),
+            ("solana_bpf_rust_secp256k1_recover", 25624),
             ("solana_bpf_rust_sha", 30692),
         ]);
     }
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 0117b235e5..3d06a3b371 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -92,7 +92,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
 fi
 
 # Install Rust-BPF
-version=v1.20
+version=v1.21
 if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
   (
     set -e
diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
index d18ffaff6f..97c95cff78 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -472,7 +472,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
         eprintln!("Can't get home directory path: {}", err);
         exit(1);
     }));
-    let version = "v1.20";
+    let version = "v1.21";
     let package = "bpf-tools";
     let target_path = home_dir
         .join(".cache")