Add llvm feature option to compile for Solana BPF target (#16495)

This commit is contained in:
Dmitri Makarov
2021-04-13 09:20:18 +02:00
committed by Justin Starry
parent 4113acbf24
commit 94e50b61e8
3 changed files with 4 additions and 2 deletions

View File

@@ -45,6 +45,7 @@ BPF_C_FLAGS := \
$(C_FLAGS) \ $(C_FLAGS) \
-target bpf \ -target bpf \
-fPIC \ -fPIC \
-march=bpfel+solana
BPF_CXX_FLAGS := \ BPF_CXX_FLAGS := \
$(CXX_FLAGS) \ $(CXX_FLAGS) \
@@ -54,6 +55,7 @@ BPF_CXX_FLAGS := \
-fno-exceptions \ -fno-exceptions \
-fno-asynchronous-unwind-tables \ -fno-asynchronous-unwind-tables \
-fno-unwind-tables \ -fno-unwind-tables \
-march=bpfel+solana
BPF_LLD_FLAGS := \ BPF_LLD_FLAGS := \
-z notext \ -z notext \

View File

@@ -92,7 +92,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
fi fi
# Install Rust-BPF # Install Rust-BPF
version=v1.5 version=v1.6
if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
( (
set -e set -e

View File

@@ -260,7 +260,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
install_if_missing( install_if_missing(
&config, &config,
"bpf-tools", "bpf-tools",
"v1.5", "v1.6",
"https://github.com/solana-labs/bpf-tools/releases/download", "https://github.com/solana-labs/bpf-tools/releases/download",
&PathBuf::from(bpf_tools_filename), &PathBuf::from(bpf_tools_filename),
) )