Skip to content

Commit 6fd8e1b

Browse files
gentoo-rootborkmann
authored andcommitted
llvm: Upgrade to LLVM 17.0.6
Fixes for Clang 17 were merged into the Cilium codebase: b91046955d6b ("datapath: Ignore new debug ELF prefixes") 6e18eb020b68 ("bpf: Fix compatibility with Clang 17 in __lb6_affinity_backend_id") 3740e9db8fef ("bpf: Fix "R2 !read_ok" verifier error with LLVM 17") c6fe6b8e2546 ("bpf/tests: Fix `conntrack_test.c` in prep for Clang update") 4dd6b0a4f97f ("bpf/tests: Fix undefined behavior in memcmp MAC addresses") f87b5dc5e0b2 ("bpf/tests: Fix undefined behavior in EXPECTED_DEST_MAC") and the complexity measurements were performed, so now the LLVM image can be upgraded. Signed-off-by: Maxim Mikityanskiy <[email protected]>
1 parent 827058d commit 6fd8e1b

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

images/llvm/checkout-llvm.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,13 @@ set -o errexit
88
set -o pipefail
99
set -o nounset
1010

11-
rev="llvmorg-10.0.0"
11+
rev="llvmorg-17.0.6"
1212

1313
git config --global user.email "[email protected]"
1414
git config --global user.name "Cilium Maintainers"
1515

1616
git clone --branch "${rev}" https://github.com/llvm/llvm-project.git /src/llvm
1717

18-
cd /src/llvm
19-
git cherry-pick 29bc5dd19407c4d7cad1c059dea26ee216ddc7ca
20-
git cherry-pick 13f6c81c5d9a7a34a684363bcaad8eb7c65356fd
21-
git cherry-pick ea72b0319d7b0f0c2fcf41d121afa5d031b319d5
22-
cd -
23-
2418
# curl --fail --show-error --silent --location "https://github.com/llvm/llvm-project/archive/${rev}.tar.gz" --output /tmp/llvm.tgz
2519
#
2620
# mkdir -p /src

images/llvm/test/spec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ commandTests:
1010
args: ["--version"]
1111
expectedOutput:
1212
- 'LLVM\ \(http://llvm\.org/\):'
13-
- 'LLVM\ version\ 10\.0\.0'
13+
- 'LLVM\ version\ 17\.0\.6'
1414
- 'Optimized\ build\.'
1515
- 'Registered\ Targets:'
1616
- '(bpf|bpfeb|bpfel)[\ ]+-\ BPF\ \((host|big|little)\ endian\)'
@@ -24,7 +24,7 @@ commandTests:
2424
command: "clang"
2525
args: ["--version"]
2626
expectedOutput:
27-
- 'clang\ version\ 10\.0\.0\ \(https://github.com/llvm/llvm-project.git\ .*\)'
27+
- 'clang\ version\ 17\.0\.6\ \(https://github.com/llvm/llvm-project.git\ .*\)'
2828
- 'InstalledDir:\ /usr/local/bin'
2929

3030
- name: "clang can compile a simple BPF program"

0 commit comments

Comments
 (0)