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

Bump bpf-tools to v1.18 (#20991)

Browse Source 
- added newlib standard C library to clang toolchain
- fixed BPF backend bug that accidentally deleted code, issue #20538
This commit is contained in:
Dmitri Makarov
2021-10-26 15:51:44 -07:00
committed by GitHub
parent 37ef1acada
commit 4287bf6b8b
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,8 @@ OS := $(shell uname)
LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm
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
STD_INC_DIRS := $(LLVM_DIR)/include
STD_LIB_DIRS := $(LLVM_DIR)/lib
ifdef LLVM_DIR
CC := $(LLVM_DIR)/bin/clang
@ -36,7 +38,8 @@ C_FLAGS := \
-fno-builtin \
-std=c17 \
$(addprefix -isystem,$(SYSTEM_INC_DIRS)) \
$(addprefix -I,$(INC_DIRS))
$(addprefix -I,$(STD_INC_DIRS)) \
$(addprefix -I,$(INC_DIRS)) \
CXX_FLAGS := \
$(C_FLAGS) \
@ -64,6 +67,8 @@ BPF_LLD_FLAGS := \
--Bdynamic \
$(LOCAL_PATH)bpf.ld \
--entry entrypoint \
-L $(STD_LIB_DIRS) \
-lc \
OBJ_DUMP_FLAGS := \
--source \
@ -114,6 +119,10 @@ help:
@echo ' INC_DIRS=$(INC_DIRS)'
@echo ' - List of system include directories:'
@echo ' SYSTEM_INC_DIRS=$(SYSTEM_INC_DIRS)'
@echo ' - List of standard library include directories:'
@echo ' STD_INC_DIRS=$(STD_INC_DIRS)'
@echo ' - List of standard library archive directories:'
@echo ' STD_LIB_DIRS=$(STD_LIB_DIRS)'
@echo ' - Location of source directories:'
@echo ' SRC_DIR=$(SRC_DIR)'
@echo ' - Location to place output files:'