From 3f4f05865d5b6dbc64a7c7be21e4dcc06ce9dacd Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@users.noreply.github.com>
Date: Sat, 13 Nov 2021 11:36:28 -0800
Subject: [PATCH] Bump bpf-tools to v1.19 (#21256)

Toolchain upgrade to rust 1.56.0 and clang 13.0.
---
 programs/bpf/tests/programs.rs  | 4 ++--
 sdk/bpf/scripts/install.sh      | 2 +-
 sdk/cargo-build-bpf/src/main.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index c7dc62ef43..f3c1fb1470 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1371,8 +1371,8 @@ fn assert_instruction_count() {
             ("noop++", 5),
             ("relative_call", 26),
             ("return_data", 980),
-            ("sanity", 1248),
-            ("sanity++", 1252),
+            ("sanity", 1255),
+            ("sanity++", 1260),
             ("secp256k1_recover", 25383),
             ("sha", 1328),
             ("struct_pass", 108),
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index f0e29b28a6..c94d51edab 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.18
+version=v1.19
 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 533b83e0ae..9ff882a814 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -473,7 +473,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.18";
+    let version = "v1.19";
     let package = "bpf-tools";
     let target_path = home_dir
         .join(".cache")