From a848837e296f9a00e31ff297be0a0cbce537e79b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 6 Jan 2026 10:43:07 +0100 Subject: [PATCH 1/3] Update to LLVM 22 --- .gitmodules | 4 ++-- src/llvm-project | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8617643a12029..66c69f4f64038 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,8 +24,8 @@ shallow = true [submodule "src/llvm-project"] path = src/llvm-project - url = https://github.com/rust-lang/llvm-project.git - branch = rustc/21.1-2025-08-01 + url = https://github.com/nikic/llvm-project.git + branch = rust-llvm-22 shallow = true [submodule "src/doc/embedded-book"] path = src/doc/embedded-book diff --git a/src/llvm-project b/src/llvm-project index 00d23d10dc48c..c583807ff75cb 160000 --- a/src/llvm-project +++ b/src/llvm-project @@ -1 +1 @@ -Subproject commit 00d23d10dc48c6bb9d57ba96d4a748d85d77d0c7 +Subproject commit c583807ff75cb4627be6296a4818494302e41e68 From 209f2a9b1c33cb648c676f4608ffca926929b474 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 8 Jan 2026 15:32:16 +0100 Subject: [PATCH 2/3] Update host toolchain --- src/ci/docker/scripts/build-clang.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/scripts/build-clang.sh b/src/ci/docker/scripts/build-clang.sh index 905c407730429..67a3253dec44c 100755 --- a/src/ci/docker/scripts/build-clang.sh +++ b/src/ci/docker/scripts/build-clang.sh @@ -5,7 +5,8 @@ set -ex source shared.sh # Try to keep the LLVM version here in sync with src/ci/scripts/install-clang.sh -LLVM=llvmorg-21.1.0-rc2 +#LLVM=llvmorg-21.1.0-rc2 +LLVM=9e78d8a4fb0739455ecdfd1751b347fbd7038c13 mkdir llvm-project cd llvm-project From e0458dea08d7ab52a146a7ff78c5fffa2b2e2c7f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 15 Jan 2026 09:27:11 +0100 Subject: [PATCH 3/3] Add patches --- src/llvm-project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/llvm-project b/src/llvm-project index c583807ff75cb..b9e038f10e9df 160000 --- a/src/llvm-project +++ b/src/llvm-project @@ -1 +1 @@ -Subproject commit c583807ff75cb4627be6296a4818494302e41e68 +Subproject commit b9e038f10e9df2e344143af45217965707758d9a