From 76ec4554b0da3874f45805f78751cf0114575672 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Sat, 9 Mar 2024 11:40:12 +0100
Subject: [PATCH] Update toolchains

- Update LLVM to 18.1.1.
---
 build/plugins/llvm-mingw/compiler-rt-sanitizers.mk  | 2 +-
 build/plugins/llvm-mingw/llvm-mingw.mk              | 6 +++---
 build/plugins/llvm-mingw/llvm.mk                    | 4 ++--
 build/plugins/llvm-mingw/patches/rust-1-fixes.patch | 2 +-
 build/plugins/llvm-mingw/rust.mk                    | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/plugins/llvm-mingw/compiler-rt-sanitizers.mk b/build/plugins/llvm-mingw/compiler-rt-sanitizers.mk
index b340fdb2..d1e0aabc 100644
--- a/build/plugins/llvm-mingw/compiler-rt-sanitizers.mk
+++ b/build/plugins/llvm-mingw/compiler-rt-sanitizers.mk
@@ -2,7 +2,7 @@
 
 PKG             := compiler-rt-sanitizers
 $(PKG)_WEBSITE  := https://compiler-rt.llvm.org/
-$(PKG)_VERSION  := 18.1.0
+$(PKG)_VERSION  := 18.1.1
 $(PKG)_DEPS     := cc
 $(PKG)_TYPE     := meta
 
diff --git a/build/plugins/llvm-mingw/llvm-mingw.mk b/build/plugins/llvm-mingw/llvm-mingw.mk
index aaeb69c0..b73c07dd 100644
--- a/build/plugins/llvm-mingw/llvm-mingw.mk
+++ b/build/plugins/llvm-mingw/llvm-mingw.mk
@@ -4,9 +4,9 @@ PKG             := llvm-mingw
 $(PKG)_WEBSITE  := https://github.com/mstorsjo/llvm-mingw
 $(PKG)_DESCR    := An LLVM/Clang/LLD based mingw-w64 toolchain
 $(PKG)_IGNORE   :=
-# https://github.com/mstorsjo/llvm-mingw/tarball/5bf2c94e6f0cebf185b17837ac444208dc849b85
-$(PKG)_VERSION  := 5bf2c94
-$(PKG)_CHECKSUM := a5adb2a5a2a14bd7e491980bbcf363e21e6d96d61164361129c2743cb5207bfa
+# https://github.com/mstorsjo/llvm-mingw/tarball/79e51a92c3454f3b6a6022b3d925d34d8115d125
+$(PKG)_VERSION  := 79e51a9
+$(PKG)_CHECKSUM := 8a9b782a2cf2e85925374f3a72207ca84a8686f22d7f565d9dda5ab7d51261e4
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-mingw-[0-9]*.patch)))
 $(PKG)_GH_CONF  := mstorsjo/llvm-mingw/branches/master
 $(PKG)_DEPS     := mingw-w64
diff --git a/build/plugins/llvm-mingw/llvm.mk b/build/plugins/llvm-mingw/llvm.mk
index 6a98b2fc..1c7661ab 100644
--- a/build/plugins/llvm-mingw/llvm.mk
+++ b/build/plugins/llvm-mingw/llvm.mk
@@ -5,8 +5,8 @@ $(PKG)_WEBSITE  := https://llvm.org/
 $(PKG)_DESCR    := A collection of modular and reusable compiler and toolchain technologies
 $(PKG)_IGNORE   :=
 # This version needs to be in-sync with the compiler-rt-sanitizers package
-$(PKG)_VERSION  := 18.1.0
-$(PKG)_CHECKSUM := 758a048046ac5024f86c868bb17c631500eed8f8d2677ae6a72ab7ad01602277
+$(PKG)_VERSION  := 18.1.1
+$(PKG)_CHECKSUM := 8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-[0-9]*.patch)))
 $(PKG)_GH_CONF  := llvm/llvm-project/releases/latest,llvmorg-,,,,.tar.xz
 $(PKG)_SUBDIR   := $(PKG)-project-$(subst -,,$($(PKG)_VERSION)).src
diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch
index 7571c359..c5bc1d8a 100644
--- a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch
+++ b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch
@@ -37,7 +37,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s
 index 1111111..2222222 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1558,6 +1558,7 @@ supported_targets! {
+@@ -1559,6 +1559,7 @@ supported_targets! {
      ("i686-uwp-windows-gnu", i686_uwp_windows_gnu),
      ("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
  
diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk
index 80f34cb3..76e55376 100644
--- a/build/plugins/llvm-mingw/rust.mk
+++ b/build/plugins/llvm-mingw/rust.mk
@@ -2,13 +2,13 @@ PKG             := rust
 $(PKG)_WEBSITE  := https://www.rust-lang.org/
 $(PKG)_DESCR    := A systems programming language focused on safety, speed and concurrency.
 $(PKG)_IGNORE   :=
-# https://static.rust-lang.org/dist/2024-03-07/rustc-nightly-src.tar.xz.sha256
+# https://static.rust-lang.org/dist/2024-03-09/rustc-nightly-src.tar.xz.sha256
 $(PKG)_VERSION  := nightly
-$(PKG)_CHECKSUM := 08d4fba3cf971f40f561ee426e2b52428fd7a17ed2eab54e8b1be1ac5c74d9f4
+$(PKG)_CHECKSUM := 4f99fe8c9d940a384290e348cf23e6b3821220dc465c6afde370f0a6e5804a34
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_SUBDIR   := $(PKG)c-$($(PKG)_VERSION)-src
 $(PKG)_FILE     := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz
-$(PKG)_URL      := https://static.rust-lang.org/dist/2024-03-07/$($(PKG)_FILE)
+$(PKG)_URL      := https://static.rust-lang.org/dist/2024-03-09/$($(PKG)_FILE)
 $(PKG)_DEPS     := $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)