diff --git a/main/llvm16/APKBUILD b/main/llvm16/APKBUILD
index 19c1cf7ca6f..8d146fd6d98 100644
--- a/main/llvm16/APKBUILD
+++ b/main/llvm16/APKBUILD
@@ -28,6 +28,7 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/l
 	0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
 	allocscore.patch
 	fix-memory-mf_exec-on-aarch64.patch
+	gcc15-cstdint.patch
 	install-prefix.patch
 	llvm-stack-size.patch
 	ppc64le-miscompile.patch
@@ -343,6 +344,7 @@ sha512sums="
 84ed6b165445d0cdb59daa59f612a7d960bf67b13a1b19bdd2a19d46548013e756faca6b8249cb6c60354f3a9aaef46652e5f531944c71294e46d2f7bfd8b832  0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
 ef63d5e01440cff65c10b84b65099bbd539bae72065d5581a8d2409cf2d0d4410d5bb3f501273ab29ee65bf8f5d23653a074428c2711ff9209324de56b857f3f  allocscore.patch
 1826a6877d0c9e93c2d6ce0b4f83fe1118b9449f82f1919b37be5fc6d7c11ae22e0c02a7d3e6e23ce41bbb07df2ff08124aa9172e254ef2b12ecbc80d9a674a9  fix-memory-mf_exec-on-aarch64.patch
+6799218f1938e028d253f02e70af01ea300b3435e2bd9db35e38a669ea3c3fdab89b676c62c780007d900e7c187692efe4da3267b71f43028bdbd0478653fde1  gcc15-cstdint.patch
 ebc0be314c129ef38f00c8c2be9d589658cae89ac8cda109e35933b5044e775a3d370c0c584d3e501e4d43167b8523d8c5e5a85653d8ebe853571697ae40fb35  install-prefix.patch
 2123f01d8075a15cf8c2d8091fc8c92cb99807b1d654af13b436690ddb55f3e893a494593b3c92aeab26e50db4e0500ac688129ab6bc11e4765c0308b90db101  llvm-stack-size.patch
 f0d7262981ef94a7d08b69f732e69f0c7a76690b1b89442ef0ab17d5d3bb5bcc52ecb4ab8eae00cb710e142e1f8988d5d0e512d18aac6e215fc793cb52d11eb7  ppc64le-miscompile.patch
diff --git a/main/llvm16/gcc15-cstdint.patch b/main/llvm16/gcc15-cstdint.patch
new file mode 100644
index 00000000000..2c2a91a0fe9
--- /dev/null
+++ b/main/llvm16/gcc15-cstdint.patch
@@ -0,0 +1,75 @@
+Patch-Source-1: https://github.com/llvm/llvm-project/commit/7abf44069aec61eee147ca67a6333fc34583b524
+Patch-Source-2: https://github.com/llvm/llvm-project/commit/8f39502b85d34998752193e85f36c408d3c99248
+Patch-Source-3: https://github.com/llvm/llvm-project/commit/7e44305041d96b064c197216b931ae3917a34ac1
+--
+From 7abf44069aec61eee147ca67a6333fc34583b524 Mon Sep 17 00:00:00 2001
+From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
+Date: Mon, 20 Jan 2025 17:52:47 +0100
+Subject: [PATCH] Add missing include to X86MCTargetDesc.h (#123320)
+
+In gcc-15, explicit includes of `<cstdint>` are required when fixed-size
+integers are used. In this file, this include only happened as a side
+effect of including SmallVector.h
+
+Although llvm compiles fine, the root-project would benefit from
+explicitly including it here, so we can backport the patch.
+
+Maybe interesting for @hahnjo and @vgvassilev
+---
+ llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
++++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
+@@ -13,6 +13,7 @@
+ #ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H
+ #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H
+ 
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ 
+--
+From 8f39502b85d34998752193e85f36c408d3c99248 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 3 Aug 2024 06:36:43 +0100
+Subject: [PATCH] [AMDGPU] Include `<cstdint>` in AMDGPUMCTargetDesc (#101766)
+
+---
+ llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h
++++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h
+@@ -15,6 +15,7 @@
+ #ifndef LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H
+ #define LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H
+ 
++#include <cstdint>
+ #include <memory>
+ 
+ namespace llvm {
+--
+From 7e44305041d96b064c197216b931ae3917a34ac1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Aug 2024 23:07:21 +0100
+Subject: [PATCH] [ADT] Add `<cstdint>` to SmallVector (#101761)
+
+SmallVector uses `uint32_t`, `uint64_t` without including `<cstdint>`
+which fails to build w/ GCC 15 after a change in libstdc++ [0]
+
+[0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3a817a4a5a6d94da9127af3be9f84a74e3076ee2
+---
+ llvm/include/llvm/ADT/SmallVector.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/llvm/include/llvm/ADT/SmallVector.h
++++ b/llvm/include/llvm/ADT/SmallVector.h
+@@ -19,6 +19,7 @@
+ #include <algorithm>
+ #include <cassert>
+ #include <cstddef>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstring>
+ #include <functional>