gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump bpf-tools to v1.1 (#15776)

Browse Source
This commit is contained in:
Dmitri Makarov 2021-03-10 18:13:38 +01:00 committed by GitHub
parent c836cd85c3
commit c5a5d7457e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/bpf/tests/programs.rs
View File

@ -1244,15 +1244,15 @@ fn assert_instruction_count() {
#[cfg(feature = "bpf_rust")] #[cfg(feature = "bpf_rust")]
{ {
programs.extend_from_slice(&[ programs.extend_from_slice(&[
("solana_bpf_rust_128bit", 570), ("solana_bpf_rust_128bit", 581),
("solana_bpf_rust_alloc", 8809), ("solana_bpf_rust_alloc", 8941),
("solana_bpf_rust_dep_crate", 2), ("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_iter", 724),
("solana_bpf_rust_many_args", 237), ("solana_bpf_rust_many_args", 237),
("solana_bpf_rust_noop", 500), ("solana_bpf_rust_noop", 479),
("solana_bpf_rust_param_passing", 56), ("solana_bpf_rust_param_passing", 54),
("solana_bpf_rust_ristretto", 19208), ("solana_bpf_rust_ristretto", 19275),
("solana_bpf_rust_sanity", 956), ("solana_bpf_rust_sanity", 956),
]); ]);
} }

5
sdk/bpf/c/bpf.ld
View File

@ -8,9 +8,10 @@ PHDRS
SECTIONS SECTIONS
{ {
. = SIZEOF_HEADERS; . = SIZEOF_HEADERS;
.text : { *(.text) } :text .text : { *(.text*) } :text
.rodata : { *(.rodata) } :rodata .rodata : { *(.rodata*) } :rodata
.dynamic : { *(.dynamic) } :dynamic .dynamic : { *(.dynamic) } :dynamic
.data.rel.ro : { *(.data.rel.ro*) } :dynamic
.dynsym : { *(.dynsym) } :dynamic .dynsym : { *(.dynsym) } :dynamic
.dynstr : { *(.dynstr) } :dynamic .dynstr : { *(.dynstr) } :dynamic
.gnu.hash : { *(.gnu.hash) } :dynamic .gnu.hash : { *(.gnu.hash) } :dynamic

4
sdk/bpf/c/bpf.mk
View File

@ -14,8 +14,8 @@ TEST_PREFIX ?= test_
OUT_DIR ?= ./out OUT_DIR ?= ./out
OS := $(shell uname) OS := $(shell uname)
LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm/ LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm
LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/8.0.0/include LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/11.0.1/include
ifdef LLVM_DIR ifdef LLVM_DIR
CC := $(LLVM_DIR)/bin/clang CC := $(LLVM_DIR)/bin/clang

2
sdk/bpf/env.sh
View File

@ -24,8 +24,8 @@ export RUSTFLAGS="
-C link-arg=-T$bpf_sdk/rust/bpf.ld \ -C link-arg=-T$bpf_sdk/rust/bpf.ld \
-C link-arg=--Bdynamic \ -C link-arg=--Bdynamic \
-C link-arg=-shared \ -C link-arg=-shared \
-C link-arg=--threads=1 \
-C link-arg=--entry=entrypoint \ -C link-arg=--entry=entrypoint \
-C link-arg=-no-threads \
-C linker=$bpf_sdk/dependencies/bpf-tools/llvm/bin/ld.lld" -C linker=$bpf_sdk/dependencies/bpf-tools/llvm/bin/ld.lld"
# CARGO may be set if run from within cargo, causing # CARGO may be set if run from within cargo, causing

5
sdk/bpf/rust/bpf.ld
View File

@ -8,9 +8,10 @@ PHDRS
SECTIONS SECTIONS
{ {
. = SIZEOF_HEADERS; . = SIZEOF_HEADERS;
.text : { *(.text) } :text .text : { *(.text*) } :text
.rodata : { *(.rodata) } :rodata .rodata : { *(.rodata*) } :rodata
.dynamic : { *(.dynamic) } :dynamic .dynamic : { *(.dynamic) } :dynamic
.data.rel.ro : { *(.data.rel.ro*) } :dynamic
.dynsym : { *(.dynsym) } :dynamic .dynsym : { *(.dynsym) } :dynamic
.dynstr : { *(.dynstr) } :dynamic .dynstr : { *(.dynstr) } :dynamic
.gnu.hash : { *(.gnu.hash) } :dynamic .gnu.hash : { *(.gnu.hash) } :dynamic

2
sdk/bpf/scripts/dump.sh
View File

@ -32,7 +32,7 @@ dump_mangled=$dump.mangled
set -ex set -ex
ls -la "$so" > "$dump_mangled" ls -la "$so" > "$dump_mangled"
"$bpf_sdk"/dependencies/bpf-tools/llvm/bin/llvm-readelf -aW "$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" sed s/://g < "$dump_mangled" | rustfilt > "$dump"
) )
rm -f "$dump_mangled" rm -f "$dump_mangled"

4
sdk/bpf/scripts/install.sh
View File

@ -130,7 +130,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
fi fi
# Install Rust-BPF # Install Rust-BPF
version=v1.0 version=v1.1
if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
( (
set -e set -e
@ -157,7 +157,7 @@ set -e
rustup toolchain link bpf bpf-tools/rust rustup toolchain link bpf bpf-tools/rust
# Install Rust-BPF Sysroot sources # Install Rust-BPF Sysroot sources
version=v1.0 version=v1.1
if [[ ! -e rust-bpf-sysroot-$version.md || ! -e rust-bpf-sysroot ]]; then if [[ ! -e rust-bpf-sysroot-$version.md || ! -e rust-bpf-sysroot ]]; then
( (
set -e set -e