git: 09efb97f9658 - main - devel/llvm-{cheri,morello}: drop non-working llvm21 workaround

From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Mon, 12 Oct 2026 14:19:13 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09efb97f9658647cff43a58b13f2cefe3abddf39

commit 09efb97f9658647cff43a58b13f2cefe3abddf39
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2026-10-12 14:17:19 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2026-10-12 14:18:50 +0000

    devel/llvm-{cheri,morello}: drop non-working llvm21 workaround
---
 devel/llvm-cheri/Makefile                                     |  4 ----
 .../files/clang21-patch-llvm_tools_sancov_sancov.cpp          | 11 -----------
 2 files changed, 15 deletions(-)

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 8d1e1a3555a1..3e675a965385 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -188,10 +188,6 @@ USES+=		${_USES_PYTHON}
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 210
-EXTRA_PATCHES+=	${PATCHDIR}/clang21-patch-llvm_tools_sancov_sancov.cpp
-.endif
-
 .if exists(${PATCHDIR}/llvm${LLVM_MAJOR})
 EXTRA_PATCHES+=	${PATCHDIR}/llvm${LLVM_MAJOR}
 .endif
diff --git a/devel/llvm-cheri/files/clang21-patch-llvm_tools_sancov_sancov.cpp b/devel/llvm-cheri/files/clang21-patch-llvm_tools_sancov_sancov.cpp
deleted file mode 100644
index 46085a53cf3b..000000000000
--- a/devel/llvm-cheri/files/clang21-patch-llvm_tools_sancov_sancov.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- llvm/tools/sancov/sancov.cpp.orig	2023-11-28 08:52:28 UTC
-+++ llvm/tools/sancov/sancov.cpp
-@@ -518,7 +518,7 @@ class Ignorelists { (private)
-   static std::unique_ptr<SpecialCaseList> createUserIgnorelist() {
-     if (ClIgnorelist.empty())
-       return std::unique_ptr<SpecialCaseList>();
--    return SpecialCaseList::createOrDie({{ClIgnorelist}},
-+    return SpecialCaseList::createOrDie({{ClIgnorelist.getValue()}},
-                                         *vfs::getRealFileSystem());
-   }
-   std::unique_ptr<SpecialCaseList> DefaultIgnorelist;