main/llvm*: update to 22.2.3

And sneaky other updates where relevant

Fixes #5011

Author: q66

main/bcc/patches/4c7be1ec6ab74e973f8d18a9011fa349c3d9dd58.patch

@@ -0,0 +1,60 @@
+From 4c7be1ec6ab74e973f8d18a9011fa349c3d9dd58 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Mon, 2 Mar 2026 10:03:15 +0100
+Subject: [PATCH] Fix build with LLVM-22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+LLVM-22 changed the signatures of various createDiagnostics() calls [1].
+Introduce a new version macro guard and adapt the code to the changed API.
+
+Fixes #5483
+
+[1] https://github.com/llvm/llvm-project/commit/30633f30894129919050f24fdd1f8f6bc46beae0
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+---
+ src/cc/frontends/clang/loader.cc | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/cc/frontends/clang/loader.cc b/src/cc/frontends/clang/loader.cc
+index 6f8387aaf017..1f706344724d 100644
+--- a/src/cc/frontends/clang/loader.cc
++++ b/src/cc/frontends/clang/loader.cc
+@@ -464,7 +464,10 @@ int ClangLoader::do_compile(
+   }
+   invocation0.getFrontendOpts().DisableFree = false;
+ 
+-#if LLVM_VERSION_MAJOR >= 20
++#if LLVM_VERSION_MAJOR >= 22
++  compiler0.setVirtualFileSystem(llvm::vfs::getRealFileSystem());
++  compiler0.createDiagnostics(new IgnoringDiagConsumer());
++#elif LLVM_VERSION_MAJOR >= 20
+   compiler0.createDiagnostics(*llvm::vfs::getRealFileSystem(), new IgnoringDiagConsumer());
+ #else
+   compiler0.createDiagnostics(new IgnoringDiagConsumer());
+@@ -487,7 +490,10 @@ int ClangLoader::do_compile(
+   add_main_input(invocation1, main_path, &*out_buf);
+   invocation1.getFrontendOpts().DisableFree = false;
+ 
+-#if LLVM_VERSION_MAJOR >= 20
++#if LLVM_VERSION_MAJOR >= 22
++  compiler1.setVirtualFileSystem(llvm::vfs::getRealFileSystem());
++  compiler1.createDiagnostics();
++#elif LLVM_VERSION_MAJOR >= 20
+   compiler1.createDiagnostics(*llvm::vfs::getRealFileSystem());
+ #else
+   compiler1.createDiagnostics();
+@@ -517,7 +523,10 @@ int ClangLoader::do_compile(
+   invocation2.getCodeGenOpts().setInlining(CodeGenOptions::NormalInlining);
+   // suppress warnings in the 2nd pass, but bail out on errors (our fault)
+   invocation2.getDiagnosticOpts().IgnoreWarnings = true;
+-#if LLVM_VERSION_MAJOR >= 20
++#if LLVM_VERSION_MAJOR >= 22
++  compiler2.setVirtualFileSystem(llvm::vfs::getRealFileSystem());
++  compiler2.createDiagnostics();
++#elif LLVM_VERSION_MAJOR >= 20
+   compiler2.createDiagnostics(*llvm::vfs::getRealFileSystem());
+ #else
+   compiler2.createDiagnostics();

main/bcc/patches/8c5c96ad3beeed2fa827017f451a952306826974.patch

@@ -1,7 +1,7 @@
 pkgname = "bcc"
 # keep in sync with main/libbpf-tools
-pkgver = "0.35.0"
-pkgrel = 1
+pkgver = "0.36.1"
+pkgrel = 0
 build_style = "cmake"
 configure_args = [
     "-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
@@ -24,7 +24,6 @@
 ]
 makedepends = [
     "clang-devel",
-    "clang-tools-extra",  # for cmake
     "elfutils-devel",
     "libbpf-devel",
     "libxml2-devel",
@@ -41,7 +40,7 @@
 license = "Apache-2.0"
 url = "https://github.com/iovisor/bcc"
 source = f"{url}/archive/refs/tags/v{pkgver}.tar.gz"
-sha256 = "7adf1716d2a3df6802c3bb17664d79b9d68d7316a6773eb08d6e691c5ff0b2fc"
+sha256 = "3b16f1eb6a5b90a5a68686c0f4195455f1c58da5ae40f004e931c19e98fa8d98"
 tool_flags = {
     # see libbpf comment about bpf headers
     "CFLAGS": ["-I/usr/include/bpf/uapi"],

main/bcc/template.py

@@ -1,7 +1,7 @@
 pkgname = "binutils"
 pkgver = "2.45.1"
-_llvmver = "21.1.8"
-pkgrel = 0
+_llvmver = "22.1.3"
+pkgrel = 1
 build_style = "gnu_configure"
 configure_args = [
     "--prefix=/usr",
@@ -53,7 +53,7 @@
 ]
 sha256 = [
     "5fe101e6fe9d18fdec95962d81ed670fdee5f37e3f48f0bef87bddf862513aa5",
-    "c165183819e41b25e708ea8d0938ae43125b946509016ee8550db3c09da9237b",
+    "210d46064ba6982a58e9b0f94e05f2d86f1b7c33a190c2a717f7c35a3b19b2fc",
 ]
 # resistance is futile
 options = ["!check", "!lto", "linkundefver", "empty"]

main/binutils/template.py

@@ -1,6 +1,6 @@
 pkgname = "blender"
 pkgver = "5.0.1"
-pkgrel = 1
+pkgrel = 2
 build_style = "cmake"
 configure_args = [
     "-DCMAKE_BUILD_TYPE=Release",

main/blender/template.py

@@ -1,6 +1,6 @@
 pkgname = "bpftool"
-pkgver = "7.6.0"
-pkgrel = 1
+pkgver = "7.7.0"
+pkgrel = 0
 build_wrksrc = "src"
 build_style = "makefile"
 make_build_args = [
@@ -22,19 +22,20 @@
     "libcap-devel",
     "linux-headers",
     "llvm-devel",
+    "openssl3-devel",
 ]
 pkgdesc = "Linux kernel bpf manipulation tool"
 license = "GPL-2.0-only"
 url = "https://github.com/libbpf/bpftool"
 source = [
     f"{url}/archive/refs/tags/v{pkgver}.tar.gz",
     # bpftool uses libbpf internals
-    "https://github.com/libbpf/libbpf/archive/58dd1f58b57294b2e59482245b29e46f1812b82d.tar.gz",
+    "https://github.com/libbpf/libbpf/archive/f5dcbae736e5d7f83a35718e01be1a8e3010fa39.tar.gz",
 ]
 source_paths = [".", "libbpf"]
 sha256 = [
-    "66ffaadb3043b300ce94c08a10d9a5e41e5f0bc5d221d8d19a4518e35ae6448c",
-    "9d8960f81a8e08d112ba3ad83d3c676ec4b2d6aaf6969781a16213e6a8f3d4ed",
+    "6d9937fa9cff83b0e7a1f64d4348819e36e34de1bfb9d2ba7c5b36d150431463",
+    "2897bbd6df85be269fb4b0ccd3b7047f13ed8d400a27e58151192b152965a061",
 ]
 # nope
 options = ["!check"]

main/bpftool/template.py

@@ -1,5 +1,5 @@
 pkgname = "clang-rt-builtins-mingw-w64"
-pkgver = "21.1.8"
+pkgver = "22.1.3"
 pkgrel = 0
 build_style = "cmake"
 configure_args = [
@@ -28,7 +28,6 @@
 cmake_dir = "compiler-rt"
 hostmakedepends = [
     "base-cross",
-    "clang-tools-extra",
     "cmake",
     "llvm-devel",
     "ninja",
@@ -39,7 +38,7 @@
 license = "Apache-2.0 WITH LLVM-exception AND NCSA"
 url = "https://llvm.org"
 source = f"https://github.com/llvm/llvm-project/releases/download/llvmorg-{pkgver}/llvm-project-{pkgver}.src.tar.xz"
-sha256 = "4633a23617fa31a3ea51242586ea7fb1da7140e426bd62fc164261fe036aa142"
+sha256 = "2488c33a959eafba1c44f253e5bbe7ac958eb53fa626298a3a5f4b87373767cd"
 hardening = ["!scp"]
 # crosstoolchain
 options = ["!check", "empty"]

main/clang-rt-builtins-mingw-w64/template.py

@@ -1,7 +1,7 @@
-From 83413a6b1f789cf2c78a2d90108faccf28c4f861 Mon Sep 17 00:00:00 2001
+From 38e4e0bfed313b1a854037ad489f45400995bd14 Mon Sep 17 00:00:00 2001
 From: q66 <q66@chimera-linux.org>
 Date: Sun, 14 Apr 2024 14:33:38 +0200
-Subject: [PATCH 05/29] compiler-rt: ppc sanitizer fixes
+Subject: [PATCH 05/28] compiler-rt: ppc sanitizer fixes
 
 ---
  compiler-rt/cmake/base-config-ix.cmake        |  3 +-
@@ -12,7 +12,7 @@ Subject: [PATCH 05/29] compiler-rt: ppc sanitizer fixes
  5 files changed, 44 insertions(+), 4 deletions(-)
 
 diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
-index d92bc0e71..caeed40e3 100644
+index 37dfa5534..fbff4ed6b 100644
 --- a/compiler-rt/cmake/base-config-ix.cmake
 +++ b/compiler-rt/cmake/base-config-ix.cmake
 @@ -233,9 +233,10 @@ macro(test_targets)
@@ -28,7 +28,7 @@ index d92bc0e71..caeed40e3 100644
        test_target_arch(s390x "" "")
      elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "sparc")
 diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
-index 16caf699a..2332d319a 100644
+index b73b84c29..35703905f 100644
 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
 +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
 @@ -90,6 +90,10 @@
@@ -56,7 +56,7 @@ index ea8cc3062..44237eba3 100644
  #      ifdef __arm__
  typedef struct user_fpregs elf_fpregset_t;
 diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
-index 24929b8c4..3620201b9 100644
+index 2bf547f4a..80dbf1c88 100644
 --- a/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
 +++ b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
 @@ -31,7 +31,7 @@
@@ -132,5 +132,5 @@ index 7e872b5b4..9616a09d8 100644
 
  inline bool probeRequiredCPUFeatures() XRAY_NEVER_INSTRUMENT {
 -- 
-2.51.1
+2.52.0
 

main/clang-rt-cross/patches/0005-compiler-rt-ppc-sanitizer-fixes.patch

@@ -1,17 +1,17 @@
-From 2f57bfd4410d7a911ff908b2cb00a971b6bb5bf8 Mon Sep 17 00:00:00 2001
+From 8198fa59b4982108aa32ee30f98b015d5f0dd022 Mon Sep 17 00:00:00 2001
 From: q66 <q66@chimera-linux.org>
 Date: Sat, 4 Nov 2023 08:55:34 +0100
-Subject: [PATCH 06/29] compiler-rt: default to libc++ for sanitizers
+Subject: [PATCH 06/28] compiler-rt: default to libc++ for sanitizers
 
 ---
  compiler-rt/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
-index 9f8e8334d..b793dd4fd 100644
+index a92258ae1..48fa39c8a 100644
 --- a/compiler-rt/CMakeLists.txt
 +++ b/compiler-rt/CMakeLists.txt
-@@ -228,7 +228,7 @@ macro(handle_default_cxx_lib var)
+@@ -230,7 +230,7 @@ macro(handle_default_cxx_lib var)
        set(${var}_LIBNAME "libc++")
        set(${var}_INTREE 1)
      else()
@@ -21,5 +21,5 @@ index 9f8e8334d..b793dd4fd 100644
      endif()
    else()
 -- 
-2.51.1
+2.52.0