From c5a5d7457e9d62b14b4aa0f43e04d80f52f7aa1c Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@users.noreply.github.com>
Date: Wed, 10 Mar 2021 18:13:38 +0100
Subject: [PATCH] Bump bpf-tools to v1.1 (#15776)

---
 programs/bpf/tests/programs.rs | 12 ++++++------
 sdk/bpf/c/bpf.ld               |  5 +++--
 sdk/bpf/c/bpf.mk               |  6 +++---
 sdk/bpf/env.sh                 |  2 +-
 sdk/bpf/rust/bpf.ld            |  5 +++--
 sdk/bpf/scripts/dump.sh        |  2 +-
 sdk/bpf/scripts/install.sh     |  4 ++--
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index 3baa46cd9..6ba9c6bb0 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1244,15 +1244,15 @@ fn assert_instruction_count() {
     #[cfg(feature = "bpf_rust")]
     {
         programs.extend_from_slice(&[
-            ("solana_bpf_rust_128bit", 570),
-            ("solana_bpf_rust_alloc", 8809),
+            ("solana_bpf_rust_128bit", 581),
+            ("solana_bpf_rust_alloc", 8941),
             ("solana_bpf_rust_dep_crate", 2),
-            ("solana_bpf_rust_external_spend", 526),
+            ("solana_bpf_rust_external_spend", 505),
             ("solana_bpf_rust_iter", 724),
             ("solana_bpf_rust_many_args", 237),
-            ("solana_bpf_rust_noop", 500),
-            ("solana_bpf_rust_param_passing", 56),
-            ("solana_bpf_rust_ristretto", 19208),
+            ("solana_bpf_rust_noop", 479),
+            ("solana_bpf_rust_param_passing", 54),
+            ("solana_bpf_rust_ristretto", 19275),
             ("solana_bpf_rust_sanity", 956),
         ]);
     }
diff --git a/sdk/bpf/c/bpf.ld b/sdk/bpf/c/bpf.ld
index 62a717066..227589c0c 100644
--- a/sdk/bpf/c/bpf.ld
+++ b/sdk/bpf/c/bpf.ld
@@ -8,9 +8,10 @@ PHDRS
 SECTIONS
 {
   . = SIZEOF_HEADERS;
-  .text : { *(.text) } :text
-  .rodata : { *(.rodata) } :rodata
+  .text : { *(.text*) } :text
+  .rodata : { *(.rodata*) } :rodata
   .dynamic : { *(.dynamic) } :dynamic
+  .data.rel.ro : { *(.data.rel.ro*) } :dynamic
   .dynsym : { *(.dynsym) } :dynamic
   .dynstr : { *(.dynstr) } :dynamic
   .gnu.hash : { *(.gnu.hash) } :dynamic
diff --git a/sdk/bpf/c/bpf.mk b/sdk/bpf/c/bpf.mk
index d056afcd4..8d9eae6d9 100644
--- a/sdk/bpf/c/bpf.mk
+++ b/sdk/bpf/c/bpf.mk
@@ -14,8 +14,8 @@ TEST_PREFIX ?= test_
 OUT_DIR ?= ./out
 OS := $(shell uname)
 
-LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm/
-LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/8.0.0/include
+LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm
+LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/11.0.1/include
 
 ifdef LLVM_DIR
 CC := $(LLVM_DIR)/bin/clang
@@ -144,7 +144,7 @@ $1: $2
 endef
 
 define CC_RULE
-$1: $2 
+$1: $2
 	@echo "[cxx] $1 ($2)"
 	$(_@)mkdir -p $(dir $1)
 	$(_@)$(CXX) $(BPF_CXX_FLAGS) -o $1 -c $2 -MD -MF $(1:.o=.d)
diff --git a/sdk/bpf/env.sh b/sdk/bpf/env.sh
index db94262b2..d2878d3a1 100644
--- a/sdk/bpf/env.sh
+++ b/sdk/bpf/env.sh
@@ -24,8 +24,8 @@ export RUSTFLAGS="
     -C link-arg=-T$bpf_sdk/rust/bpf.ld \
     -C link-arg=--Bdynamic \
     -C link-arg=-shared \
+    -C link-arg=--threads=1 \
     -C link-arg=--entry=entrypoint \
-    -C link-arg=-no-threads \
     -C linker=$bpf_sdk/dependencies/bpf-tools/llvm/bin/ld.lld"
 
 # CARGO may be set if run from within cargo, causing
diff --git a/sdk/bpf/rust/bpf.ld b/sdk/bpf/rust/bpf.ld
index 62a717066..227589c0c 100644
--- a/sdk/bpf/rust/bpf.ld
+++ b/sdk/bpf/rust/bpf.ld
@@ -8,9 +8,10 @@ PHDRS
 SECTIONS
 {
   . = SIZEOF_HEADERS;
-  .text : { *(.text) } :text
-  .rodata : { *(.rodata) } :rodata
+  .text : { *(.text*) } :text
+  .rodata : { *(.rodata*) } :rodata
   .dynamic : { *(.dynamic) } :dynamic
+  .data.rel.ro : { *(.data.rel.ro*) } :dynamic
   .dynsym : { *(.dynsym) } :dynamic
   .dynstr : { *(.dynstr) } :dynamic
   .gnu.hash : { *(.gnu.hash) } :dynamic
diff --git a/sdk/bpf/scripts/dump.sh b/sdk/bpf/scripts/dump.sh
index 47ab94db5..e76be0737 100755
--- a/sdk/bpf/scripts/dump.sh
+++ b/sdk/bpf/scripts/dump.sh
@@ -32,7 +32,7 @@ dump_mangled=$dump.mangled
   set -ex
   ls -la "$so" > "$dump_mangled"
   "$bpf_sdk"/dependencies/bpf-tools/llvm/bin/llvm-readelf -aW "$so" >>"$dump_mangled"
-  "$OBJDUMP" -print-imm-hex --source --disassemble "$so" >> "$dump_mangled"
+  "$OBJDUMP" --print-imm-hex --source --disassemble "$so" >> "$dump_mangled"
   sed s/://g < "$dump_mangled" | rustfilt > "$dump"
 )
 rm -f "$dump_mangled"
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 61b3d075c..cf99b6c1b 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -130,7 +130,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
 fi
 
 # Install Rust-BPF
-version=v1.0
+version=v1.1
 if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
   (
     set -e
@@ -157,7 +157,7 @@ set -e
 rustup toolchain link bpf bpf-tools/rust
 
 # Install Rust-BPF Sysroot sources
-version=v1.0
+version=v1.1
 if [[ ! -e rust-bpf-sysroot-$version.md || ! -e rust-bpf-sysroot ]]; then
   (
     set -e