Update toolchains

kleisauke · kleisauke · commit ae2895e155f6 · 2022-09-07T11:38:21.000+02:00
- Update LLVM to 15.0.0.
- Update MinGW-w64 to the latest master version.

MXE Updates:
- Update GCC to 12.2.0.
diff --git a/build/build.sh b/build/build.sh
@@ -51,7 +51,7 @@ fi
 # Always checkout a particular revision which will successfully build.
 # This ensures that it will not suddenly break a build.
 # Note: Must be regularly updated.
-revision="46cf2d3f6e55d3ea30f515041bf01352c4f1a7ce"
+revision="fa26c6fd61596109d289c80f73a2d1b08736ac3f"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then
diff --git a/build/overrides.mk b/build/overrides.mk
@@ -178,6 +178,16 @@ nasm_FILE     := nasm-$(nasm_VERSION).tar.xz
 nasm_URL      := https://www.nasm.us/pub/nasm/releasebuilds/$(nasm_VERSION)/$(nasm_FILE)
 nasm_URL_2    := https://sources.voidlinux.org/nasm-$(nasm_VERSION)/$(nasm_FILE)
 
+# upstream version is 10.0.0
+# Update MinGW-w64 to d4a0c84
+# https://github.com/mingw-w64/mingw-w64/tarball/d4a0c84d908243a45255a06dc293d3d7c06db98c
+mingw-w64_VERSION  := d4a0c84
+mingw-w64_CHECKSUM := 1bf133d9827756223f4610601a87e129b11f2caa91ebf993a6017c4a4bab06dc
+mingw-w64_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/mingw-w64-[0-9]*.patch)))
+mingw-w64_SUBDIR   := mingw-w64-mingw-w64-$(mingw-w64_VERSION)
+mingw-w64_FILE     := mingw-w64-mingw-w64-$(mingw-w64_VERSION).tar.gz
+mingw-w64_URL      := https://github.com/mingw-w64/mingw-w64/tarball/$(mingw-w64_VERSION)/$(mingw-w64_FILE)
+
 ## Patches that we override with our own
 
 freetype_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/freetype-[0-9]*.patch)))
diff --git a/build/patches/fftw-3-fixes.patch b/build/patches/fftw-3-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <github@kleisauke.nl>
 Date: Sun, 16 Feb 2020 19:20:00 +0100
-Subject: [PATCH 1/1] Fixes for the llvm-mingw ARM/ARM64 build
+Subject: [PATCH 1/3] Fixes for the llvm-mingw ARM/ARM64 build
 
 
 diff --git a/threads/threads.c b/threads/threads.c
@@ -28,3 +28,80 @@ index 1111111..2222222 100644
            Sleep(0);
       }
  }
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kleis Auke Wolthuizen <github@kleisauke.nl>
+Date: Tue, 2 Aug 2022 22:01:33 +0200
+Subject: [PATCH 2/3] Fix build with LLVM 15
+
+
+diff --git a/configure.ac b/configure.ac
+index 1111111..2222222 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -698,11 +698,8 @@ THREADLIBS=""
+ if test "$enable_threads" = "yes"; then
+         # Win32 threads are the default on Windows:
+     if test -z "$THREADLIBS"; then
+-        AC_MSG_CHECKING([for Win32 threads])
+-        AC_TRY_LINK([#include <windows.h>],
+-            [_beginthreadex(0,0,0,0,0,0);],
+-            [THREADLIBS=" "; AC_MSG_RESULT(yes)],
+-            [AC_MSG_RESULT(no)])
++        AC_CHECK_FUNC([_beginthreadex],
++            [THREADLIBS=" ";])
+     fi
+ 
+     # POSIX threads, the default choice everywhere else:
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kleis Auke Wolthuizen <github@kleisauke.nl>
+Date: Tue, 2 Aug 2022 22:02:32 +0200
+Subject: [PATCH 3/3] Regenerate configure
+
+
+diff --git a/configure b/configure
+index 1111111..2222222 100755
+--- a/configure
++++ b/configure
+@@ -21520,36 +21520,11 @@ THREADLIBS=""
+ if test "$enable_threads" = "yes"; then
+         # Win32 threads are the default on Windows:
+     if test -z "$THREADLIBS"; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Win32 threads" >&5
+-$as_echo_n "checking for Win32 threads... " >&6; }
+-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <windows.h>
+-#ifdef F77_DUMMY_MAIN
+-
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-
+-#endif
+-int
+-main ()
+-{
+-_beginthreadex(0,0,0,0,0,0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  THREADLIBS=" "; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++        ac_fn_c_check_func "$LINENO" "_beginthreadex" "ac_cv_func__beginthreadex"
++if test "x$ac_cv_func__beginthreadex" = xyes; then :
++  THREADLIBS=" ";
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
++
+     fi
+ 
+     # POSIX threads, the default choice everywhere else:
diff --git a/build/patches/glib-2-fixes.patch b/build/patches/glib-2-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <github@kleisauke.nl>
 Date: Fri, 24 Jun 2022 11:15:23 +0200
-Subject: [PATCH 1/1] Ensure standalone intl support library can be found
+Subject: [PATCH 1/2] Ensure standalone intl support library can be found
 
 See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2109#note_1485662
 
@@ -38,3 +38,29 @@ index 1111111..2222222 100644
  else
    libintl = subproject('proxy-libintl').get_variable('intl_dep')
    libintl_deps = [libintl]
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kleis Auke Wolthuizen <github@kleisauke.nl>
+Date: Tue, 2 Aug 2022 18:46:43 +0200
+Subject: [PATCH 2/2] Fix build with LLVM 15
+
+glib/gthread-win32.c:359:16: error: incompatible integer to pointer conversion passing 'DWORD' (aka 'unsigned long') to parameter of type 'gpointer' (aka 'void *') [-Wint-conversion]
+          if (!g_atomic_pointer_compare_and_exchange (&key->p, NULL, impl))
+               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+glib/gatomic.h:257:73: note: expanded from macro 'g_atomic_pointer_compare_and_exchange'
+    __atomic_compare_exchange_n ((atomic), (void *) (&(gapcae_oldval)), (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \
+                                                                        ^~~~~~~~
+
+diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
+index 1111111..2222222 100644
+--- a/glib/gthread-win32.c
++++ b/glib/gthread-win32.c
+@@ -356,7 +356,7 @@ g_private_get_impl (GPrivate *key)
+             }
+ 
+           /* Ditto, due to the unlocked access on the fast path */
+-          if (!g_atomic_pointer_compare_and_exchange (&key->p, NULL, impl))
++          if (!g_atomic_pointer_compare_and_exchange (&key->p, NULL, GUINT_TO_POINTER (impl)))
+             g_thread_abort (0, "g_private_get_impl(2)");
+         }
+       LeaveCriticalSection (&g_private_lock);
diff --git a/build/patches/mingw-w64-11-ucrtbased.patch b/build/patches/mingw-w64-11-ucrtbased.patch
@@ -27,7 +27,7 @@ index 1111111..2222222 100644
  src_libm=_libm_dummy.c
  
  if ENABLE_DFP
-@@ -906,7 +912,7 @@ lib32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
+@@ -913,7 +919,7 @@ lib32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
  lib32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
  
  processed_defs += lib32/msvcrt.def lib32/msvcr80.def lib32/msvcr90.def lib32/msvcr90d.def lib32/msvcr100.def lib32/msvcr110.def lib32/msvcr120.def lib32/msvcr120d.def \
@@ -36,7 +36,7 @@ index 1111111..2222222 100644
  				  lib32/api-ms-win-crt-math-l1-1-0.def lib32/api-ms-win-crt-private-l1-1-0.def lib32/api-ms-win-crt-runtime-l1-1-0.def \
  				  lib32/vcruntime140_app.def
  
-@@ -977,6 +983,10 @@ lib32_DATA += lib32/libucrtbase.a
+@@ -984,6 +990,10 @@ lib32_DATA += lib32/libucrtbase.a
  lib32/libucrtbase.a: lib-common/ucrtbase.mri lib32/libucrtbase_def.a lib32/libucrt_extra.a
  	cd $(dir $@) && $(AR) -M < $(abspath $<)
  
@@ -47,7 +47,7 @@ index 1111111..2222222 100644
  lib32_DATA += lib32/libucrt.a lib32/libucrtapp.a
  noinst_LIBRARIES += lib32/libcrtdll_extra.a lib32/libmsvcrt10_extra.a lib32/libmsvcrt20_extra.a lib32/libmsvcrt40_extra.a lib32/libmsvcrt_common.a lib32/libmsvcrt_extra.a lib32/libmsvcr70_extra.a lib32/libmsvcr71_extra.a lib32/libmsvcr120_app_extra.a lib32/libucrt_extra.a lib32/libucrtapp_extra.a
  lib32_libcrtdll_extra_a_SOURCES = $(src_crtdll)
-@@ -1264,7 +1274,7 @@ lib64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+@@ -1275,7 +1285,7 @@ lib64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
  
  processed_defs += lib64/msvcrt.def lib64/msvcr80.def lib64/msvcr90.def lib64/msvcr90d.def \
  				  lib64/msvcr100.def lib64/msvcr110.def lib64/msvcr120.def lib64/msvcr120d.def \
@@ -56,7 +56,7 @@ index 1111111..2222222 100644
  				  lib64/advapi32.def lib64/clbcatq.def lib64/kernel32.def lib64/ole32.def \
  				  lib64/oleaut32.def lib64/user32.def lib64/ws2_32.def \
  				  lib64/api-ms-win-crt-math-l1-1-0.def lib64/api-ms-win-crt-private-l1-1-0.def lib64/api-ms-win-crt-runtime-l1-1-0.def \
-@@ -1313,6 +1323,10 @@ lib64_DATA += lib64/libucrtbase.a
+@@ -1324,6 +1334,10 @@ lib64_DATA += lib64/libucrtbase.a
  lib64/libucrtbase.a: lib-common/ucrtbase.mri lib64/libucrtbase_def.a lib64/libucrt_extra.a
  	cd $(dir $@) && $(AR) -M < $(abspath $<)
  
@@ -67,7 +67,7 @@ index 1111111..2222222 100644
  lib64_DATA += lib64/libucrt.a lib64/libucrtapp.a
  noinst_LIBRARIES += lib64/libmsvcrt_common.a lib64/libmsvcrt_extra.a lib64/libmsvcr80_extra.a lib64/libmsvcr120_app_extra.a lib64/libucrt_extra.a lib64/libucrtapp_extra.a
  lib64_libmsvcrt_common_a_SOURCES = $(src_msvcrt_common)
-@@ -1592,7 +1606,7 @@ libarm32_LIBRARIES += libarm32/libmingwthrd.a
+@@ -1607,7 +1621,7 @@ libarm32_LIBRARIES += libarm32/libmingwthrd.a
  libarm32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
  libarm32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
  
@@ -76,7 +76,7 @@ index 1111111..2222222 100644
  				  libarm32/advapi32.def libarm32/clbcatq.def libarm32/kernel32.def libarm32/ole32.def libarm32/oleaut32.def \
  				  libarm32/user32.def libarm32/ws2_32.def \
  				  libarm32/api-ms-win-crt-math-l1-1-0.def libarm32/api-ms-win-crt-private-l1-1-0.def libarm32/api-ms-win-crt-runtime-l1-1-0.def \
-@@ -1617,6 +1631,10 @@ libarm32_DATA += libarm32/libucrtbase.a
+@@ -1632,6 +1646,10 @@ libarm32_DATA += libarm32/libucrtbase.a
  libarm32/libucrtbase.a: lib-common/ucrtbase.mri libarm32/libucrtbase_def.a libarm32/libucrt_extra.a
  	cd $(dir $@) && $(AR) -M < $(abspath $<)
  
@@ -87,7 +87,7 @@ index 1111111..2222222 100644
  libarm32_DATA += libarm32/libucrt.a libarm32/libucrtapp.a
  noinst_LIBRARIES += libarm32/libmsvcrt_common.a libarm32/libmsvcrt_extra.a libarm32/libmsvcr120_app_extra.a libarm32/libucrt_extra.a libarm32/libucrtapp_extra.a
  libarm32_libmsvcrt_common_a_SOURCES = $(src_msvcrt_common)
-@@ -1874,7 +1892,7 @@ libarm64_LIBRARIES += libarm64/libmingwthrd.a
+@@ -1893,7 +1911,7 @@ libarm64_LIBRARIES += libarm64/libmingwthrd.a
  libarm64_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
  libarm64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM64) $(sysincludes)
  
@@ -96,7 +96,7 @@ index 1111111..2222222 100644
  				  libarm64/advapi32.def libarm64/clbcatq.def libarm64/kernel32.def libarm64/ole32.def libarm64/oleaut32.def \
  				  libarm64/user32.def libarm64/ws2_32.def \
  				  libarm64/api-ms-win-crt-math-l1-1-0.def libarm64/api-ms-win-crt-private-l1-1-0.def libarm64/api-ms-win-crt-runtime-l1-1-0.def \
-@@ -1889,6 +1907,10 @@ libarm64_DATA += libarm64/libucrtbase.a
+@@ -1908,6 +1926,10 @@ libarm64_DATA += libarm64/libucrtbase.a
  libarm64/libucrtbase.a: lib-common/ucrtbase.mri libarm64/libucrtbase_def.a libarm64/libucrt_extra.a
  	cd $(dir $@) && $(AR) -M < $(abspath $<)
  
@@ -190,7 +190,7 @@ index 1111111..2222222 100644
  @LIBARM64_TRUE@@W32API_FALSE@	libarm64/libucrt.a \
  @LIBARM64_TRUE@@W32API_FALSE@	libarm64/libucrtapp.a \
  @LIBARM64_TRUE@@W32API_FALSE@	libarm64/libvcruntime140_app.a
-@@ -10389,7 +10393,7 @@ d3dcsxd = d3dcsxd_43
+@@ -10451,7 +10455,7 @@ d3dcsxd = d3dcsxd_43
  d3dcompiler = d3dcompiler_47
  
  # can move this into libsrc/dummy_libm.c or similar
@@ -199,7 +199,7 @@ index 1111111..2222222 100644
  src_libm = _libm_dummy.c
  @ENABLE_DFP_FALSE@src_dfp_math = 
  @ENABLE_DFP_TRUE@src_dfp_math = \
-@@ -77886,6 +77890,12 @@ uninstall-am: uninstall-crt32DATA uninstall-crt64DATA \
+@@ -78216,6 +78220,12 @@ uninstall-am: uninstall-crt32DATA uninstall-crt64DATA \
  
  _libm_dummy.c:
  	echo "static int __attribute__((unused)) __mingw_libm_dummy;" > _libm_dummy.c
@@ -212,7 +212,7 @@ index 1111111..2222222 100644
  @LIB32_TRUE@lib32/crt1.o: crt/crtexe.c
  @LIB32_TRUE@	$(COMPILE32) -c $< -o $@
  @LIB32_TRUE@lib32/crt2.o: lib32/crt1.o
-@@ -77942,6 +77952,8 @@ _libm_dummy.c:
+@@ -78272,6 +78282,8 @@ _libm_dummy.c:
  @LIB32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
  @LIB32_TRUE@@W32API_FALSE@lib32/libucrtbase.a: lib-common/ucrtbase.mri lib32/libucrtbase_def.a lib32/libucrt_extra.a
  @LIB32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
@@ -221,7 +221,7 @@ index 1111111..2222222 100644
  
  @LIB32_TRUE@lib32/lib%.a: lib32/%.def
  @LIB32_TRUE@	$(DTDEF32) $<
-@@ -78015,6 +78027,8 @@ _libm_dummy.c:
+@@ -78345,6 +78357,8 @@ _libm_dummy.c:
  @LIB64_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
  @LIB64_TRUE@@W32API_FALSE@lib64/libucrtbase.a: lib-common/ucrtbase.mri lib64/libucrtbase_def.a lib64/libucrt_extra.a
  @LIB64_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
@@ -230,7 +230,7 @@ index 1111111..2222222 100644
  
  @LIB64_TRUE@lib64/lib%.a: lib64/%.def
  @LIB64_TRUE@	$(DTDEF64) $<
-@@ -78076,6 +78090,8 @@ _libm_dummy.c:
+@@ -78406,6 +78420,8 @@ _libm_dummy.c:
  @LIBARM32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
  @LIBARM32_TRUE@@W32API_FALSE@libarm32/libucrtbase.a: lib-common/ucrtbase.mri libarm32/libucrtbase_def.a libarm32/libucrt_extra.a
  @LIBARM32_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
@@ -239,7 +239,7 @@ index 1111111..2222222 100644
  
  @LIBARM32_TRUE@libarm32/lib%.a: libarm32/%.def
  @LIBARM32_TRUE@	$(DTDEFARM32) $<
-@@ -78121,6 +78137,8 @@ _libm_dummy.c:
+@@ -78451,6 +78467,8 @@ _libm_dummy.c:
  @LIBARM64_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
  @LIBARM64_TRUE@@W32API_FALSE@libarm64/libucrtbase.a: lib-common/ucrtbase.mri libarm64/libucrtbase_def.a libarm64/libucrt_extra.a
  @LIBARM64_TRUE@@W32API_FALSE@	cd $(dir $@) && $(AR) -M < $(abspath $<)
diff --git a/build/patches/mxe-fixes.patch b/build/patches/mxe-fixes.patch
@@ -233,7 +233,7 @@ index 1111111..2222222 100644
  #include <ffi.h>
  
 -int main(int argc, char *argv[])
-+int main()
++int main(void)
  {
      ffi_cif cif;
      ffi_type *args[1];
diff --git a/build/plugins/gcc/rust-std-i686.mk b/build/plugins/gcc/rust-std-i686.mk
@@ -2,10 +2,10 @@ PKG             := rust-std-i686
 $(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/rust-1.60.0-i686-pc-windows-gnu.tar.gz.sha256
-$(PKG)_VERSION  := 1.60.0
-$(PKG)_CHECKSUM := 4c38aa4b1030e8876ec612a257a09f0a61b51006272fc1490db0addf526fe1dc
+# https://static.rust-lang.org/dist/rust-1.63.0-i686-pc-windows-gnu.tar.xz.sha256
+$(PKG)_VERSION  := 1.63.0
+$(PKG)_CHECKSUM := 54f6fad9a298b5920cefbbd9aba6111e058a462bd14e67f6bdebcda95f1dde4e
 $(PKG)_SUBDIR   := rust-$($(PKG)_VERSION)-i686-pc-windows-gnu/rust-std-i686-pc-windows-gnu
-$(PKG)_FILE     := rust-$($(PKG)_VERSION)-i686-pc-windows-gnu.tar.gz
+$(PKG)_FILE     := rust-$($(PKG)_VERSION)-i686-pc-windows-gnu.tar.xz
 $(PKG)_URL      := https://static.rust-lang.org/dist/$($(PKG)_FILE)
 $(PKG)_TYPE     := source-only
diff --git a/build/plugins/gcc/rust-std-x86_64.mk b/build/plugins/gcc/rust-std-x86_64.mk
@@ -2,10 +2,10 @@ PKG             := rust-std-x86_64
 $(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/rust-1.60.0-x86_64-pc-windows-gnu.tar.gz.sha256
-$(PKG)_VERSION  := 1.60.0
-$(PKG)_CHECKSUM := d4b8692b437af2bc23b455503d6eb9656dbf7cd25fb7bb78bee0846b8ef22d26
+# https://static.rust-lang.org/dist/rust-1.63.0-x86_64-pc-windows-gnu.tar.xz.sha256
+$(PKG)_VERSION  := 1.63.0
+$(PKG)_CHECKSUM := ff44c19a81cdd8487d46584238de2a45cf8129dc38569e95fac1ab704a860bac
 $(PKG)_SUBDIR   := rust-$($(PKG)_VERSION)-x86_64-pc-windows-gnu/rust-std-x86_64-pc-windows-gnu
-$(PKG)_FILE     := rust-$($(PKG)_VERSION)-x86_64-pc-windows-gnu.tar.gz
+$(PKG)_FILE     := rust-$($(PKG)_VERSION)-x86_64-pc-windows-gnu.tar.xz
 $(PKG)_URL      := https://static.rust-lang.org/dist/$($(PKG)_FILE)
 $(PKG)_TYPE     := source-only
diff --git a/build/plugins/gcc/rust.mk b/build/plugins/gcc/rust.mk
@@ -2,11 +2,11 @@ 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/rust-1.60.0-x86_64-unknown-linux-gnu.tar.gz.sha256
-$(PKG)_VERSION  := 1.60.0
-$(PKG)_CHECKSUM := b8a4c3959367d053825e31f90a5eb86418eb0d80cacda52bfa80b078e18150d5
+# https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+$(PKG)_VERSION  := 1.63.0
+$(PKG)_CHECKSUM := be9b25bcf1e564876762e653688e0b5df11fab53048ac18bf77761cf0a0cc465
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)-x86_64-unknown-linux-gnu
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-x86_64-unknown-linux-gnu.tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-x86_64-unknown-linux-gnu.tar.xz
 $(PKG)_URL      := https://static.rust-lang.org/dist/$($(PKG)_FILE)
 $(PKG)_DEPS     := $(foreach TARGET,$(MXE_TARGETS),rust-std-$(firstword $(call split,-,$(TARGET))))
 
diff --git 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  := 14.0.5
+$(PKG)_VERSION  := 15.0.0
 $(PKG)_DEPS     := cc
 $(PKG)_TYPE     := meta
 
@@ -21,9 +21,12 @@ define $(PKG)_BUILD
         -DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \
         -DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE \
         -DCOMPILER_RT_BUILD_BUILTINS=FALSE \
+        -DCOMPILER_RT_BUILD_CRT=FALSE \
+        -DCOMPILER_RT_BUILD_XRAY=FALSE \
         -DCOMPILER_RT_BUILD_LIBFUZZER=FALSE \
         -DCOMPILER_RT_BUILD_PROFILE=FALSE \
         -DCOMPILER_RT_BUILD_MEMPROF=FALSE \
+        -DCOMPILER_RT_BUILD_ORC=FALSE \
         -DSANITIZER_CXX_ABI=libc++ \
         $(if $(BUILD_STATIC), -DCMAKE_REQUIRED_LIBRARIES='unwind')
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
diff --git 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/eac1db1c0ddbd0ec61601284048e9ade92a26542
-$(PKG)_VERSION  := eac1db1
-$(PKG)_CHECKSUM := bdcf863f270dddc28c5ca3cccbb05a3b668ca81c645bc8ce1665ed8be86417c1
+# https://github.com/mstorsjo/llvm-mingw/tarball/0a980a4f1c3710cb1a6d1db10be527d3a0ec7cbe
+$(PKG)_VERSION  := 0a980a4
+$(PKG)_CHECKSUM := 60ee79a77cb72d05f965bada99e4d3c4826d51e8e9b273632cdb5e974602c92e
 # TODO(kleisauke): Remove this if we omit any dots from our target
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-mingw-[0-9]*.patch)))
 $(PKG)_GH_CONF  := mstorsjo/llvm-mingw/branches/master
@@ -59,7 +59,7 @@ define $(PKG)_PRE_BUILD
     # Can't symlink here, it will break the basename detection of LLVM. See:
     # sys::path::stem("x86_64-w64-mingw32.shared-ranlib"); -> x86_64-w64-mingw32
     # TODO(kleisauke): Remove this if we omit any dots from our target, see:
-    # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.5/llvm/tools/llvm-ar/llvm-ar.cpp#L1285-L1304
+    # https://github.com/llvm/llvm-project/blob/llvmorg-15.0.0/llvm/tools/llvm-ar/llvm-ar.cpp#L1455-L1474
     $(foreach EXEC, addr2line ar cvtres nm objcopy ranlib rc strings strip, \
         (echo '#!/bin/sh'; \
          echo 'exec "$(PREFIX)/$(BUILD)/bin/llvm-$(EXEC)" "$$@"') \
@@ -68,7 +68,7 @@ define $(PKG)_PRE_BUILD
 
     # We need to pass some additional arguments for windres
     # TODO(kleisauke): Remove this if we omit any dots from our target, see:
-    # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.5/llvm/tools/llvm-rc/llvm-rc.cpp#L266-L277
+    # https://github.com/llvm/llvm-project/blob/llvmorg-15.0.0/llvm/tools/llvm-rc/llvm-rc.cpp#L266-L277
     (echo '#!/bin/sh'; \
      echo 'exec "$(PREFIX)/$(BUILD)/bin/llvm-windres" \
          --preprocessor-arg="--sysroot=$(PREFIX)/$(TARGET)" \
@@ -82,7 +82,7 @@ define $(PKG)_PRE_BUILD
     # armv7 -> arm
     # aarch64 -> arm64
     # TODO(kleisauke): Remove this if we omit any dots from our target, see:
-    # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.5/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp#L97-L108
+    # https://github.com/llvm/llvm-project/blob/llvmorg-15.0.0/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp#L97-L108
     $(eval DLLTOOL_ARCH := $(strip \
         $(if $(findstring i686,$(PROCESSOR)),i386, \
         $(if $(findstring x86_64,$(PROCESSOR)),i386:x86-64, \
diff --git a/build/plugins/llvm-mingw/llvm.mk b/build/plugins/llvm-mingw/llvm.mk
diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ index 1111111..2222222 100644`
`233`	`233`	`#include <ffi.h>`
`234`	`234`
`235`	`235`	`-int main(int argc, char *argv[])`
`236`		`-+int main()`
	`236`	`++int main(void)`
`237`	`237`	`{`
`238`	`238`	`ffi_cif cif;`
`239`	`239`	`ffi_type *args[1];`