Bump bpf-tools version to 1.8

sdk/bpf/c/bpf.ld

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

sdk/bpf/env.sh

@@ -14,16 +14,3 @@ export CC="$bpf_sdk/dependencies/bpf-tools/llvm/bin/clang"
 export AR="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-ar"
 export OBJDUMP="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-objdump"
 export OBJCOPY="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-objcopy"
-
-# Use the SDK's version of Rust to build for BPF
-export RUSTUP_TOOLCHAIN=bpf
-export RUSTFLAGS="
-    -C lto=no \
-    -C opt-level=2 \
-    -C link-arg=-z -C link-arg=notext \
-    -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 linker=$bpf_sdk/dependencies/bpf-tools/llvm/bin/ld.lld"

sdk/bpf/rust/bpf.ld

@@ -1,15 +0,0 @@
-PHDRS
-{
-  text PT_LOAD ;
-  rodata PT_LOAD ;
-  dynamic PT_DYNAMIC ;
-}
-
-SECTIONS
-{
-  . = SIZEOF_HEADERS;
-  .text : { *(.text*) } :text
-  .rodata : { *(.rodata*) } :rodata
-  .data.rel.ro : { *(.data.rel.ro*) } :rodata
-  .dynamic : { *(.dynamic) } :dynamic
-}

sdk/bpf/rust/build.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ "$#" -ne 1 ]]; then
-    echo "Error: Must provide the full path to the project to build"
-    exit 1
-fi
-if [[ ! -f "$1/Cargo.toml" ]]; then
-      echo "Error: Cannot find project: $1"
-    exit 1
-fi
-bpf_sdk=$(cd "$(dirname "$0")/.." && pwd)
-
-echo "Building $1"
-set -e
-# shellcheck source=sdk/bpf/env.sh
-source "$bpf_sdk"/env.sh
-
-cd "$1"
-"$XARGO" build --target "$XARGO_TARGET" --release --no-default-features --features program
-
-{ { set +x; } 2>/dev/null; echo Success; }

sdk/bpf/rust/clean.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$#" -ne 1 ]; then
-    echo "Error: Must provide the full path to the project to build"
-    exit 1
-fi
-if [ ! -f "$1/Cargo.toml" ]; then
-      echo "Error: Cannot find project: $1"
-    exit 1
-fi
-
-cd "$1"
-
-set -e
-
-echo "Cleaning $1"
-cargo clean

sdk/bpf/scripts/install.sh

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