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
7 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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)