From 1cdcabf7cf72aa115f7e8c1cec1c7c192a47224e Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 19 Jul 2021 20:46:59 +0000
Subject: [PATCH] Bump BPF tools to v1.9 (#18766)

(cherry picked from commit 47861fc373b92edbf2d9dc46019adb6e453862c5)

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

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index e8d9575dc7..c394f72b98 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1292,7 +1292,7 @@ fn assert_instruction_count() {
     #[cfg(feature = "bpf_rust")]
     {
         programs.extend_from_slice(&[
-            ("solana_bpf_rust_128bit", 572),
+            ("solana_bpf_rust_128bit", 584),
             ("solana_bpf_rust_alloc", 8906),
             ("solana_bpf_rust_custom_heap", 539),
             ("solana_bpf_rust_dep_crate", 2),
diff --git a/sdk/bpf/c/bpf.mk b/sdk/bpf/c/bpf.mk
index 1711564b19..4b3039db14 100644
--- a/sdk/bpf/c/bpf.mk
+++ b/sdk/bpf/c/bpf.mk
@@ -15,7 +15,7 @@ OUT_DIR ?= ./out
 OS := $(shell uname)
 
 LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm
-LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/11.0.1/include
+LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/12.0.1/include
 COMPILER_RT_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/rust/lib/rustlib/bpfel-unknown-unknown/lib
 
 ifdef LLVM_DIR
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 2da6710be9..7bbabff3b3 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.8
+version=v1.9
 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 da67a577d7..859a11c1eb 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -425,7 +425,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
     install_if_missing(
         config,
         "bpf-tools",
-        "v1.8",
+        "v1.9",
         "https://github.com/solana-labs/bpf-tools/releases/download",
         &PathBuf::from(bpf_tools_filename),
     )