From 215f7a2ec57378edb05cb55edd216bc887aff86f Mon Sep 17 00:00:00 2001
From: Konstantin Demin <rockdrilla@gmail.com>
Date: Tue, 15 Jul 2025 12:49:28 +0300
Subject: [PATCH] tools/llvm: update to 20.1.8

- release notes:
  - https://discourse.llvm.org/t/18-1-8-released/79725
  - https://discourse.llvm.org/t/llvm-19-1-0-released/81285
  - https://discourse.llvm.org/t/llvm-19-1-1-released/82321
  - https://discourse.llvm.org/t/llvm-19-1-2-released/82550
  - https://discourse.llvm.org/t/llvm-19-1-3-relased/82829
  - https://discourse.llvm.org/t/llvm-19-1-4-released/83230
  - https://discourse.llvm.org/t/llvm-19-1-5-released/83455
  - https://discourse.llvm.org/t/llvm-19-1-6-released/83723
  - https://discourse.llvm.org/t/llvm-19-1-7-released/84062
  - https://discourse.llvm.org/t/llvm-20-1-0-released/85122
  - https://discourse.llvm.org/t/llvm-20-1-1-released/85337
  - https://discourse.llvm.org/t/llvm-20-1-2-released/85654
  - https://discourse.llvm.org/t/llvm-20-1-3-released/85874
  - https://discourse.llvm.org/t/llvm-20-1-4-released/86147
  - https://discourse.llvm.org/t/llvm-20-1-5-released/86371
  - https://discourse.llvm.org/t/llvm-20-1-6-released/86598
  - https://discourse.llvm.org/t/llvm-20-1-7-released/86855
  - https://discourse.llvm.org/t/llvm-20-1-8-released/87259
- remove "100-gcc15.patch" (not needed anymore)
- refresh configuration options

Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19417
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 tools/llvm-bpf/Makefile                |  7 ++++---
 tools/llvm-bpf/patches/100-gcc15.patch | 23 -----------------------
 2 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 tools/llvm-bpf/patches/100-gcc15.patch

diff --git a/tools/llvm-bpf/Makefile b/tools/llvm-bpf/Makefile
index a36ca0647fd..a4e8b2dbaaf 100644
--- a/tools/llvm-bpf/Makefile
+++ b/tools/llvm-bpf/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=llvm-project
-PKG_VERSION:=18.1.7
+PKG_VERSION:=20.1.8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.xz
 PKG_SOURCE_URL:=https://github.com/llvm/llvm-project/releases/download/llvmorg-$(PKG_VERSION)
-PKG_HASH:=74446ab6943f686391954cbda0d77ae92e8a60c432eff437b8666e121d748ec4
+PKG_HASH:=6898f963c8e938981e6c4a302e83ec5beb4630147c7311183cf61069af16333d
 PKG_CPE_ID:=cpe:/a:llvm:llvm
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION).src
@@ -43,12 +43,13 @@ CMAKE_HOST_OPTIONS += \
 	-DLLVM_INCLUDE_EXAMPLES=OFF \
 	-DLLVM_INCLUDE_TESTS=OFF \
 	-DLLVM_ENABLE_BINDINGS=OFF \
+	-DLLVM_ENABLE_CURL=OFF \
+	-DLLVM_ENABLE_HTTPLIB=OFF \
 	-DLLVM_ENABLE_IDE=OFF \
 	-DLLVM_ENABLE_LIBEDIT=OFF \
 	-DLLVM_ENABLE_LIBPFM=OFF \
 	-DLLVM_ENABLE_LIBXML2=OFF \
 	-DLLVM_ENABLE_OCAMLDOC=OFF \
-	-DLLVM_ENABLE_TERMINFO=OFF \
 	-DLLVM_ENABLE_Z3_SOLVER=OFF \
 	-DLLVM_ENABLE_ZLIB=OFF \
 	-DLLVM_ENABLE_ZSTD=OFF \
diff --git a/tools/llvm-bpf/patches/100-gcc15.patch b/tools/llvm-bpf/patches/100-gcc15.patch
deleted file mode 100644
index 5b92af04e40..00000000000
--- a/tools/llvm-bpf/patches/100-gcc15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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>
-- 
2.47.2