Makefile: build testdata using clang-14, 17, 20

A prior commit upgraded the toolchain to this set of LLVM versions.

-mcpu=v3 is now the default in LLVM 20, so specify -mcpu=v2 explicitly to
maintain compatibility with 4.x kernels.

Signed-off-by: Timo Beckers <timo@isovalent.com>

diff --git a/Makefile b/Makefile
index 5b65d70c2807d08cbb35c1f0667a19de06bf1585..45462e8d5a8924c557ce865b10c77c5cd96da0ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # The development version of clang is distributed as the 'clang' binary,
 # while stable/released versions have a version number attached.
 # Pin the default clang to a stable version.
-CLANG ?= clang-17
-STRIP ?= llvm-strip-17
-OBJCOPY ?= llvm-objcopy-17
-CFLAGS := -O2 -g -Wall -Werror $(CFLAGS)
+CLANG ?= clang-20
+STRIP ?= llvm-strip-20
+OBJCOPY ?= llvm-objcopy-20
+CFLAGS := -O2 -g -Wall -Werror -mcpu=v2 $(CFLAGS)
 
 CI_KERNEL_URL ?= https://github.com/cilium/ci-kernels/raw/master/
 
@@ -25,8 +25,8 @@ IMAGE := $(shell cat ${REPODIR}/testdata/docker/IMAGE)
 VERSION := $(shell cat ${REPODIR}/testdata/docker/VERSION)
 
 TARGETS := \
-       testdata/loader-clang-11 \
        testdata/loader-clang-14 \
+       testdata/loader-clang-17 \
        testdata/loader-$(CLANG) \
        testdata/manyprogs \
        testdata/btf_map_init \

diff --git a/btf/testdata/relocs-eb.elf b/btf/testdata/relocs-eb.elf
index 7fc2336acdd6c5a4c899095fc5806650370dd8e4..355bb1e85d30205f93009f1d5d1bd10b2e52a393 100644 (file)
Binary files a/btf/testdata/relocs-eb.elf and b/btf/testdata/relocs-eb.elf differ

diff --git a/btf/testdata/relocs-el.elf b/btf/testdata/relocs-el.elf
index f16f829658562724e5f295e141c36f8f88c12bc9..e55ee044f8c8dae29895cb5268f74c31bbe41516 100644 (file)
Binary files a/btf/testdata/relocs-el.elf and b/btf/testdata/relocs-el.elf differ

diff --git a/btf/testdata/relocs_enum-eb.elf b/btf/testdata/relocs_enum-eb.elf
index 01467e9a9da18321bae386ce1a562babb43e4e6d..cbcdd0bdcbe99ee218ba448e4e42789c3b79b8f2 100644 (file)
Binary files a/btf/testdata/relocs_enum-eb.elf and b/btf/testdata/relocs_enum-eb.elf differ

diff --git a/btf/testdata/relocs_enum-el.elf b/btf/testdata/relocs_enum-el.elf
index d08985416898715cd5a2cef9eac076e5941d0197..1e519cc54f72425a95e36e951f7a7774edc626e3 100644 (file)
Binary files a/btf/testdata/relocs_enum-el.elf and b/btf/testdata/relocs_enum-el.elf differ

diff --git a/btf/testdata/relocs_read-eb.elf b/btf/testdata/relocs_read-eb.elf
index 480dcca84e9dc96d248fa26a54f3439f62ccc515..27b14654903269e7798a6abcd404b8b2767f548c 100644 (file)
Binary files a/btf/testdata/relocs_read-eb.elf and b/btf/testdata/relocs_read-eb.elf differ

diff --git a/btf/testdata/relocs_read-el.elf b/btf/testdata/relocs_read-el.elf
index 7e081a8eb1fe7209cf37b2c17b6e9a7d4ad2e35e..ec0acf4295d87346b1f245abd0cbf126386b72f6 100644 (file)
Binary files a/btf/testdata/relocs_read-el.elf and b/btf/testdata/relocs_read-el.elf differ

diff --git a/docs/examples/getting_started/counter_bpfeb.o b/docs/examples/getting_started/counter_bpfeb.o
index bc16f6f130184b3c2623372263edc1ca82fd8583..f24280869112f65045c5be735badadbf40bd3bb0 100644 (file)
Binary files a/docs/examples/getting_started/counter_bpfeb.o and b/docs/examples/getting_started/counter_bpfeb.o differ

diff --git a/docs/examples/getting_started/counter_bpfel.o b/docs/examples/getting_started/counter_bpfel.o
index f1ff40b2337ad5545691a80fce9233544d379753..31e65293b341d1885abda43f92affb0b78c98e69 100644 (file)
Binary files a/docs/examples/getting_started/counter_bpfel.o and b/docs/examples/getting_started/counter_bpfel.o differ

diff --git a/examples/cgroup_skb/bpf_bpfeb.o b/examples/cgroup_skb/bpf_bpfeb.o
index ab0fc4bd832ddf766111b9dc31099b4c91c64d40..176ca85a3db9d1915c877f5e2f444ff4a39e9137 100644 (file)
Binary files a/examples/cgroup_skb/bpf_bpfeb.o and b/examples/cgroup_skb/bpf_bpfeb.o differ

diff --git a/examples/cgroup_skb/bpf_bpfel.o b/examples/cgroup_skb/bpf_bpfel.o
index 2a7fe937a7e2749c32fa671652bee9e633e24fc4..0fb6f2a99359216c94144c2313098c53588f3ff4 100644 (file)
Binary files a/examples/cgroup_skb/bpf_bpfel.o and b/examples/cgroup_skb/bpf_bpfel.o differ

diff --git a/examples/fentry/bpf_bpfeb.o b/examples/fentry/bpf_bpfeb.o
index 0f327df52312ec7293a5abd01717379bf45ec21d..cc367ab9743ee6b9a723a22ac99160d0420233de 100644 (file)
Binary files a/examples/fentry/bpf_bpfeb.o and b/examples/fentry/bpf_bpfeb.o differ

diff --git a/examples/fentry/bpf_bpfel.o b/examples/fentry/bpf_bpfel.o
index 276f435eb798f05e62399895e6ec1c4ce2ae135b..cd84612b434c0dbcec12ee662c403f5a353403dd 100644 (file)
Binary files a/examples/fentry/bpf_bpfel.o and b/examples/fentry/bpf_bpfel.o differ

diff --git a/examples/kprobe/bpf_bpfeb.o b/examples/kprobe/bpf_bpfeb.o
index 4e8a0e07d8ae9a899eb8e038923dcf980cbdf050..083efbc90aff4f3f18cf6928b20a1205bac836d9 100644 (file)
Binary files a/examples/kprobe/bpf_bpfeb.o and b/examples/kprobe/bpf_bpfeb.o differ

diff --git a/examples/kprobe/bpf_bpfel.o b/examples/kprobe/bpf_bpfel.o
index 036525db3b910cb627b42c69c61f94801f0c4840..42eb1c34320ecdeb4e0c79e0e91d79a841e67d6f 100644 (file)
Binary files a/examples/kprobe/bpf_bpfel.o and b/examples/kprobe/bpf_bpfel.o differ

diff --git a/examples/kprobe_percpu/bpf_bpfeb.o b/examples/kprobe_percpu/bpf_bpfeb.o
index ae87a3ad67d9b6444ae4a54e3c63f1b69af43b85..e80504658045cb7164c4c2551472124823123cbe 100644 (file)
Binary files a/examples/kprobe_percpu/bpf_bpfeb.o and b/examples/kprobe_percpu/bpf_bpfeb.o differ

diff --git a/examples/kprobe_percpu/bpf_bpfel.o b/examples/kprobe_percpu/bpf_bpfel.o
index 7c025027fd3d2239c265cda0dbc959e6ea30c1ee..7a998729061f1bd03ee7c3f10a3c74fdd4bfac86 100644 (file)
Binary files a/examples/kprobe_percpu/bpf_bpfel.o and b/examples/kprobe_percpu/bpf_bpfel.o differ

diff --git a/examples/kprobepin/bpf_bpfeb.o b/examples/kprobepin/bpf_bpfeb.o
index cb9dfbf1df3197d300663ca82fef515ca2bd18f3..59ccf012ae4f16d3fa65e769cc4d49e2c616d96f 100644 (file)
Binary files a/examples/kprobepin/bpf_bpfeb.o and b/examples/kprobepin/bpf_bpfeb.o differ

diff --git a/examples/kprobepin/bpf_bpfel.o b/examples/kprobepin/bpf_bpfel.o
index addd5edfe7929d9dd64a2a469c52756478fed80c..f954271360a83bba1dd2a4e2079e02a4e6dc5c88 100644 (file)
Binary files a/examples/kprobepin/bpf_bpfel.o and b/examples/kprobepin/bpf_bpfel.o differ

diff --git a/examples/ringbuffer/bpf_bpfeb.o b/examples/ringbuffer/bpf_bpfeb.o
index 0cd270e7b64f5414d4170e0433da437e09c38948..b02007dd490d7be9cf0d3753db8b111cf2143e78 100644 (file)
Binary files a/examples/ringbuffer/bpf_bpfeb.o and b/examples/ringbuffer/bpf_bpfeb.o differ

diff --git a/examples/ringbuffer/bpf_bpfel.o b/examples/ringbuffer/bpf_bpfel.o
index 4848d3ba658b72b4a4dc7266d7b0b60dce81e7d7..316137527f5f447ed788587c1f8eeabd5e9f3caa 100644 (file)
Binary files a/examples/ringbuffer/bpf_bpfel.o and b/examples/ringbuffer/bpf_bpfel.o differ

diff --git a/examples/tcprtt/bpf_bpfeb.o b/examples/tcprtt/bpf_bpfeb.o
index b879f43df757648c4526580a8d57fb26fceb9376..418dd6d3aee63a90d5c2a467db3a6b3731d0e5c2 100644 (file)
Binary files a/examples/tcprtt/bpf_bpfeb.o and b/examples/tcprtt/bpf_bpfeb.o differ

diff --git a/examples/tcprtt/bpf_bpfel.o b/examples/tcprtt/bpf_bpfel.o
index 2142336ce8ddd2eef4f40abe5b4e44c20a53a1c5..183b648536795fc4a3286ee58319b4a7c6d35cba 100644 (file)
Binary files a/examples/tcprtt/bpf_bpfel.o and b/examples/tcprtt/bpf_bpfel.o differ

diff --git a/examples/tcprtt_sockops/bpf_bpfeb.o b/examples/tcprtt_sockops/bpf_bpfeb.o
index d603be1c2d4cbeb99b724d855a39bc1bf9fef721..8b2b3a2558b2499dc8624f2d4e17a79e221e4271 100644 (file)
Binary files a/examples/tcprtt_sockops/bpf_bpfeb.o and b/examples/tcprtt_sockops/bpf_bpfeb.o differ

diff --git a/examples/tcprtt_sockops/bpf_bpfel.o b/examples/tcprtt_sockops/bpf_bpfel.o
index cd7a1edfcc73441392c07cec950575b0af0b1e20..4d4788e92cab9de5affa084795e5c2fa5e4a8e74 100644 (file)
Binary files a/examples/tcprtt_sockops/bpf_bpfel.o and b/examples/tcprtt_sockops/bpf_bpfel.o differ

diff --git a/examples/tracepoint_in_c/bpf_bpfeb.o b/examples/tracepoint_in_c/bpf_bpfeb.o
index 96601cae83dc0dbae1ff4d57e5bc9d2a542b29a2..74977e1c40a60da00106b236e93deea8aac3ca90 100644 (file)
Binary files a/examples/tracepoint_in_c/bpf_bpfeb.o and b/examples/tracepoint_in_c/bpf_bpfeb.o differ

diff --git a/examples/tracepoint_in_c/bpf_bpfel.o b/examples/tracepoint_in_c/bpf_bpfel.o
index f9f1b060ab98437c579d88b646ccb12961823dd0..4962798eed5ed29bd7f3ff1c0ea9ca3761eee1dc 100644 (file)
Binary files a/examples/tracepoint_in_c/bpf_bpfel.o and b/examples/tracepoint_in_c/bpf_bpfel.o differ

diff --git a/examples/uretprobe/bpf_x86_bpfel.o b/examples/uretprobe/bpf_x86_bpfel.o
index 26df3449ebd8266ed1bd9a529c50f5961278b588..c64d04fbc3c85ae301ba1eb8a41bb37b4aec7dec 100644 (file)
Binary files a/examples/uretprobe/bpf_x86_bpfel.o and b/examples/uretprobe/bpf_x86_bpfel.o differ

diff --git a/examples/xdp/bpf_bpfeb.o b/examples/xdp/bpf_bpfeb.o
index f90c8b997706593327b0fdc1e810c20db3022979..8a95d6af11c93b55615fc4fb64400b4954b248fc 100644 (file)
Binary files a/examples/xdp/bpf_bpfeb.o and b/examples/xdp/bpf_bpfeb.o differ

diff --git a/examples/xdp/bpf_bpfel.o b/examples/xdp/bpf_bpfel.o
index 35dba4b8ef7d483c86d63db8c794a2b1eb5c498f..30aafe7ef9ec0de5a989ad56f5dc1a4cc078c32d 100644 (file)
Binary files a/examples/xdp/bpf_bpfel.o and b/examples/xdp/bpf_bpfel.o differ

diff --git a/testdata/errors-eb.elf b/testdata/errors-eb.elf
index a4d7883df1cc6bd11670a15ff93c5e2edd083950..a8024235938d68f7b52a6fb9f972f72d186334ee 100644 (file)
Binary files a/testdata/errors-eb.elf and b/testdata/errors-eb.elf differ

diff --git a/testdata/errors-el.elf b/testdata/errors-el.elf
index 6ebf77bd9568702ea6edfec10dbfc649c44e55ac..f241fcab90d3b906c018c4d0a600f96409c66f78 100644 (file)
Binary files a/testdata/errors-el.elf and b/testdata/errors-el.elf differ

diff --git a/testdata/fwd_decl-eb.elf b/testdata/fwd_decl-eb.elf
index 7a4a46b6ae01f63d507a153f868505046e5ff817..cf03b598b58a1c4a56918cf05f84bfe0d95abb66 100644 (file)
Binary files a/testdata/fwd_decl-eb.elf and b/testdata/fwd_decl-eb.elf differ

diff --git a/testdata/fwd_decl-el.elf b/testdata/fwd_decl-el.elf
index ea33e50efe489cd97fb7304c6c50fe4107d7fbb8..e4e296d57e230f85d21b07b7198e505312ea4ded 100644 (file)
Binary files a/testdata/fwd_decl-el.elf and b/testdata/fwd_decl-el.elf differ

diff --git a/testdata/invalid_map_static-eb.elf b/testdata/invalid_map_static-eb.elf
index a001f736e262880137419f23d93d5d0bebc2be1f..a4e52c7ac83af2ccbf4ef39dae80736b7254f8ab 100644 (file)
Binary files a/testdata/invalid_map_static-eb.elf and b/testdata/invalid_map_static-eb.elf differ

diff --git a/testdata/invalid_map_static-el.elf b/testdata/invalid_map_static-el.elf
index 557e92925d81f1f87e004a32d64b450289134e4a..1d40428ca5eb2417b9880ead14a0981eda074d1e 100644 (file)
Binary files a/testdata/invalid_map_static-el.elf and b/testdata/invalid_map_static-el.elf differ

diff --git a/testdata/kconfig-eb.elf b/testdata/kconfig-eb.elf
index 6b876f9299ebce1b4e67b3f47e95160cbe86d246..3017ee3cb972b861e8ab7c487f2e3bfe307e4a9a 100644 (file)
Binary files a/testdata/kconfig-eb.elf and b/testdata/kconfig-eb.elf differ

diff --git a/testdata/kconfig-el.elf b/testdata/kconfig-el.elf
index 292f24aab860f1141d882174075f0f016fdfc9c2..b3b1fe584baf63ade33d1d0c51509e9d9178508d 100644 (file)
Binary files a/testdata/kconfig-el.elf and b/testdata/kconfig-el.elf differ

diff --git a/testdata/kfunc-eb.elf b/testdata/kfunc-eb.elf
index d49d147424485e3eb1c33a2142d4364ba040eea2..8fdc35c37c293dd83a579a3f421116d8bc6f8bb4 100644 (file)
Binary files a/testdata/kfunc-eb.elf and b/testdata/kfunc-eb.elf differ

diff --git a/testdata/kfunc-el.elf b/testdata/kfunc-el.elf
index 1f1dca6148080077f366ab80b7110eda40254094..415a57bb65382057471a3cd6a7835b34c3bd3a15 100644 (file)
Binary files a/testdata/kfunc-el.elf and b/testdata/kfunc-el.elf differ

diff --git a/testdata/ksym-eb.elf b/testdata/ksym-eb.elf
index d5da81159f29024d38b41cc9bdd3eeb95dba6d3e..2f65182f00940aeff3cd59680265f17fb8193912 100644 (file)
Binary files a/testdata/ksym-eb.elf and b/testdata/ksym-eb.elf differ

diff --git a/testdata/ksym-el.elf b/testdata/ksym-el.elf
index a39b44a12121621467e8a4123f2e325d45ede8b1..689bf75d717ff7d58737031a20a7f4789ef45d28 100644 (file)
Binary files a/testdata/ksym-el.elf and b/testdata/ksym-el.elf differ

diff --git a/testdata/loader-clang-11-eb.elf b/testdata/loader-clang-11-eb.elf
deleted file mode 100644 (file)
index 603fc46..0000000
Binary files a/testdata/loader-clang-11-eb.elf and /dev/null differ

diff --git a/testdata/loader-clang-11-el.elf b/testdata/loader-clang-11-el.elf
deleted file mode 100644 (file)
index 9f9c60b..0000000
Binary files a/testdata/loader-clang-11-el.elf and /dev/null differ

diff --git a/testdata/loader-clang-14-eb.elf b/testdata/loader-clang-14-eb.elf
index fa792ca1077fdd0689b85a28318ec20bb1eabd42..d2a790562e519add01fe317a62b549c2919a2c15 100644 (file)
Binary files a/testdata/loader-clang-14-eb.elf and b/testdata/loader-clang-14-eb.elf differ

diff --git a/testdata/loader-clang-14-el.elf b/testdata/loader-clang-14-el.elf
index adf828d35fda8faeebbd342b9b4c2f256b8cdb46..18a57a765ac07a4e54f5d03332ecf46e4b946467 100644 (file)
Binary files a/testdata/loader-clang-14-el.elf and b/testdata/loader-clang-14-el.elf differ

diff --git a/testdata/loader-clang-17-eb.elf b/testdata/loader-clang-17-eb.elf
index fa792ca1077fdd0689b85a28318ec20bb1eabd42..d2a790562e519add01fe317a62b549c2919a2c15 100644 (file)
Binary files a/testdata/loader-clang-17-eb.elf and b/testdata/loader-clang-17-eb.elf differ

diff --git a/testdata/loader-clang-17-el.elf b/testdata/loader-clang-17-el.elf
index adf828d35fda8faeebbd342b9b4c2f256b8cdb46..18a57a765ac07a4e54f5d03332ecf46e4b946467 100644 (file)
Binary files a/testdata/loader-clang-17-el.elf and b/testdata/loader-clang-17-el.elf differ

diff --git a/testdata/loader-clang-20-eb.elf b/testdata/loader-clang-20-eb.elf
new file mode 100644 (file)
index 0000000..2591118
Binary files /dev/null and b/testdata/loader-clang-20-eb.elf differ

diff --git a/testdata/loader-clang-20-el.elf b/testdata/loader-clang-20-el.elf
new file mode 100644 (file)
index 0000000..03be504
Binary files /dev/null and b/testdata/loader-clang-20-el.elf differ

diff --git a/testdata/loader-eb.elf b/testdata/loader-eb.elf
index 33d7f883d6ccdb7afee055fbaec2fae0546ee14e..6a0d34e2c63cabcdf303c992fc83fff00d01c753 120000 (symlink)
--- a/testdata/loader-eb.elf
+++ b/testdata/loader-eb.elf
@@ -1 +1 @@
-loader-clang-17-eb.elf
\ No newline at end of file
+loader-clang-20-eb.elf
\ No newline at end of file

diff --git a/testdata/loader-el.elf b/testdata/loader-el.elf
index 1379cce8414438f0cfc99a21c6de21ca9d4b0704..1ca11ae60a51b786a25b26f78dfc8784034ec46c 120000 (symlink)
--- a/testdata/loader-el.elf
+++ b/testdata/loader-el.elf
@@ -1 +1 @@
-loader-clang-17-el.elf
\ No newline at end of file
+loader-clang-20-el.elf
\ No newline at end of file

diff --git a/testdata/loader.c b/testdata/loader.c
index 7563ab487189c4d973930b2971d836e399ea4142..bb47d8cc608b5480ed8b70ad511c17185eb59aec 100644 (file)
--- a/testdata/loader.c
+++ b/testdata/loader.c
@@ -162,10 +162,7 @@ __section("socket/4") int anon_const() {
        volatile int ctx = 0;
 
 // 32 bytes wide results in a .rodata.cst32 section.
-#define values \
-       (uint64_t[]) { \
-               0x0, 0x1, 0x2, 0x3 \
-       }
+#define values (uint64_t[]){0x0, 0x1, 0x2, 0x3}
 
        int i;
        for (i = 0; i < 3; i++) {

diff --git a/testdata/manyprogs-eb.elf b/testdata/manyprogs-eb.elf
index 258f087d8c2b5c80cc31bb6c8d1a6f2e1de536be..e0ff23b67f6ebf4594a3344e5035481cb0189aed 100644 (file)
Binary files a/testdata/manyprogs-eb.elf and b/testdata/manyprogs-eb.elf differ

diff --git a/testdata/manyprogs-el.elf b/testdata/manyprogs-el.elf
index 61ea4d304f78d6556179a4ffeaa0d48b71fb840e..3b7a608fabffa1524ae0e37e97df69b886d60f0b 100644 (file)
Binary files a/testdata/manyprogs-el.elf and b/testdata/manyprogs-el.elf differ

diff --git a/testdata/strings-eb.elf b/testdata/strings-eb.elf
index 608dea5428596bf0ea95a0f83f56e0ad947b5ada..1de4812400707bd33b565e60a6861d85517f8fdc 100644 (file)
Binary files a/testdata/strings-eb.elf and b/testdata/strings-eb.elf differ

diff --git a/testdata/strings-el.elf b/testdata/strings-el.elf
index bf7c3faf42672a9808891f45397a7c0c1a44f5c0..efadd2da0eebc911833f0ef07deb5b50451ab836 100644 (file)
Binary files a/testdata/strings-el.elf and b/testdata/strings-el.elf differ

diff --git a/testdata/subprog_reloc-eb.elf b/testdata/subprog_reloc-eb.elf
index d0acc4f9e6e275bd0e3636bb2291f1fb21752cff..8ce158200e9f4eef8f3a4cdcc6da422d1fb14563 100644 (file)
Binary files a/testdata/subprog_reloc-eb.elf and b/testdata/subprog_reloc-eb.elf differ

diff --git a/testdata/subprog_reloc-el.elf b/testdata/subprog_reloc-el.elf
index 5b8d81a9eec6c16a8db839ebf117bcfa1e581807..9eef33f240da3a4ebeca67f5fcb98fecb9273e0c 100644 (file)
Binary files a/testdata/subprog_reloc-el.elf and b/testdata/subprog_reloc-el.elf differ

diff --git a/testdata/variables-eb.elf b/testdata/variables-eb.elf
index 50c3252dcb56b84cd985c386150d9139d19c960b..41677afb98513a2a530e05a4baf3514bf1962db2 100644 (file)
Binary files a/testdata/variables-eb.elf and b/testdata/variables-eb.elf differ

diff --git a/testdata/variables-el.elf b/testdata/variables-el.elf
index 681641b33d3087bf39e69fe62a67ba5e6669664b..7f15c6b8844ff34af61416c5f51fe50cbb26472f 100644 (file)
Binary files a/testdata/variables-el.elf and b/testdata/variables-el.elf differ