From db3bca7edd632a8ea7db7b50c8be981bcb8720c8 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@users.noreply.github.com>
Date: Tue, 13 Apr 2021 09:20:18 +0200
Subject: [PATCH] Add llvm feature option to compile for Solana BPF target
 (#16495)

---
 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, 5 insertions(+), 3 deletions(-)

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index d76261047a..3d891df893 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1245,7 +1245,7 @@ fn assert_instruction_count() {
             ("solana_bpf_rust_noop", 472),
             ("solana_bpf_rust_param_passing", 46),
             ("solana_bpf_rust_ristretto", 19220),
-            ("solana_bpf_rust_sanity", 894),
+            ("solana_bpf_rust_sanity", 901),
         ]);
     }
 
diff --git a/sdk/bpf/c/bpf.mk b/sdk/bpf/c/bpf.mk
index 8d9eae6d9d..31584e2943 100644
--- a/sdk/bpf/c/bpf.mk
+++ b/sdk/bpf/c/bpf.mk
@@ -44,6 +44,7 @@ BPF_C_FLAGS := \
   $(C_FLAGS) \
   -target bpf \
   -fPIC \
+  -march=bpfel+solana
 
 BPF_CXX_FLAGS := \
   $(CXX_FLAGS) \
@@ -53,6 +54,7 @@ BPF_CXX_FLAGS := \
   -fno-exceptions \
   -fno-asynchronous-unwind-tables \
   -fno-unwind-tables \
+  -march=bpfel+solana
 
 BPF_LLD_FLAGS := \
   -z notext \
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 684c492850..274f536f63 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.5
+version=v1.6
 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 0d9f19c942..5bf7bb9f26 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -360,7 +360,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
     install_if_missing(
         &config,
         "bpf-tools",
-        "v1.5",
+        "v1.6",
         "https://github.com/solana-labs/bpf-tools/releases/download",
         &PathBuf::from(bpf_tools_filename),
     )