Skip to content

Commit 2abfdb3

Browse files
indygregSchamper
authored andcommitted
LLVM toolchain 21.1.4 -> 22.1.1 (astral-sh#1008)
Let's stay modern. I performed no verification beyond CI passing.
1 parent 756f613 commit 2abfdb3

4 files changed

Lines changed: 21 additions & 21 deletions

File tree

cpython-unix/patch-jit-llvm-version-3.13.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ diff --git a/Tools/jit/_llvm.py b/Tools/jit/_llvm.py
66
import typing
77

88
-_LLVM_VERSION = 18
9-
+_LLVM_VERSION = 21
9+
+_LLVM_VERSION = 22
1010
_LLVM_VERSION_PATTERN = re.compile(rf"version\s+{_LLVM_VERSION}\.\d+\.\d+\S*\s+")
1111

1212
_P = typing.ParamSpec("_P")

cpython-unix/patch-jit-llvm-version-3.14.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ diff --git a/Tools/jit/_llvm.py b/Tools/jit/_llvm.py
66
import typing
77

88
-_LLVM_VERSION = 19
9-
+_LLVM_VERSION = 21
9+
+_LLVM_VERSION = 22
1010
_LLVM_VERSION_PATTERN = re.compile(rf"version\s+{_LLVM_VERSION}\.\d+\.\d+\S*\s+")
1111

1212
_P = typing.ParamSpec("_P")

pythonbuild/downloads.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -178,31 +178,31 @@
178178
},
179179
# Remember to update LLVM_URL in src/release.rs whenever upgrading.
180180
"llvm-21-aarch64-linux": {
181-
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20251029/llvm-21.1.4+20251029-gnu_only-aarch64-unknown-linux-gnu.tar.zst",
182-
"size": 230693810,
183-
"sha256": "2933d04136d102d7b82e6a712c5a2d45430045a17689033713e7daab931f111f",
184-
"version": "21.1.4+20251029",
181+
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20260312/llvm-22.1.1+20260312-gnu_only-aarch64-unknown-linux-gnu.tar.zst",
182+
"size": 237665010,
183+
"sha256": "0f7ef68a9d6239336aa073366edd5377a47192c32d40c96ff72b416a15259999",
184+
"version": "22.1.1+20260312",
185185
},
186186
# Remember to update LLVM_URL in src/release.rs whenever upgrading.
187187
"llvm-21-x86_64-linux": {
188-
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20251029/llvm-21.1.4+20251029-gnu_only-x86_64-unknown-linux-gnu.tar.zst",
189-
"size": 273582186,
190-
"sha256": "4d33971109cab386c1721f7af80b8559f7e678164a0fed443909a84347c666f4",
191-
"version": "21.1.4+20251029",
188+
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20260312/llvm-22.1.1+20260312-gnu_only-x86_64-unknown-linux-gnu.tar.zst",
189+
"size": 281108139,
190+
"sha256": "2a2f2e51bb9c621c6b00a42d8349f27edcb3aacaa750040000ac95a0298e97c1",
191+
"version": "22.1.1+20260312",
192192
},
193193
# Remember to update LLVM_URL in src/release.rs whenever upgrading.
194194
"llvm-aarch64-macos": {
195-
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20251029/llvm-21.1.4+20251029-aarch64-apple-darwin.tar.zst",
196-
"size": 155537884,
197-
"sha256": "4a17d032ea9c2bd86203f5195df57fe621b0cc5163b858bb4208584fa41e8fc4",
198-
"version": "21.1.4+20251029",
195+
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20260312/llvm-22.1.1+20260312-aarch64-apple-darwin.tar.zst",
196+
"size": 159781503,
197+
"sha256": "04df05eed3dde711a5962f031f3075e3d46bad92eb0520bc4c2814ac0210c56f",
198+
"version": "22.1.1+20260312",
199199
},
200200
# Remember to update LLVM_URL in src/release.rs whenever upgrading.
201201
"llvm-x86_64-macos": {
202-
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20251029/llvm-21.1.4+20251029-x86_64-apple-darwin.tar.zst",
203-
"size": 163122945,
204-
"sha256": "a245a0a8bf529d8dc57ea48b930313b1325f5540bf42ddb8704ce525926cde46",
205-
"version": "21.1.4+20251029",
202+
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20260312/llvm-22.1.1+20260312-x86_64-apple-darwin.tar.zst",
203+
"size": 167381561,
204+
"sha256": "aef8508bef17a2d40b07ff955917ff7f36c1a609116ee8c052e12307ec748314",
205+
"version": "22.1.1+20260312",
206206
},
207207
"m4": {
208208
# Mirrored from https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz

src/release.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -669,14 +669,14 @@ pub fn produce_install_only_stripped(tar_gz_path: &Path, llvm_dir: &Path) -> Res
669669
static LLVM_URL: Lazy<Url> = Lazy::new(|| {
670670
if cfg!(target_os = "macos") {
671671
if std::env::consts::ARCH == "aarch64" {
672-
Url::parse("https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20251029/llvm-21.1.4+20251029-aarch64-apple-darwin.tar.zst").unwrap()
672+
Url::parse("https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20260312/llvm-22.1.1+20260312-aarch64-apple-darwin.tar.zst").unwrap()
673673
} else if std::env::consts::ARCH == "x86_64" {
674-
Url::parse("https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20251029/llvm-21.1.4+20251029-x86_64-apple-darwin.tar.zst").unwrap()
674+
Url::parse("https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20260312/llvm-22.1.1+20260312-x86_64-apple-darwin.tar.zst").unwrap()
675675
} else {
676676
panic!("unsupported macOS architecture");
677677
}
678678
} else if cfg!(target_os = "linux") {
679-
Url::parse("https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20251029/llvm-21.1.4+20251029-gnu_only-x86_64-unknown-linux-gnu.tar.zst").unwrap()
679+
Url::parse("https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20260312/llvm-22.1.1+20260312-gnu_only-x86_64-unknown-linux-gnu.tar.zst").unwrap()
680680
} else {
681681
panic!("unsupported platform");
682682
}

0 commit comments

Comments
 (0)