2 files changed, 24 insertions, 31 deletions
diff --git a/lang/dotnet8/files/patch-clang19 b/lang/dotnet8/files/patch-clang19
deleted file mode 100644
index 3b54459f15a1..000000000000
--- a/lang/dotnet8/files/patch-clang19
+++ /dev/null
@@ -1,31 +0,0 @@
-By Omair Majid. Obtained from Alpine Linux.
-
-Notably, Dotnet-9 already has these.
-
-	-mi
---- src/runtime/src/coreclr/vm/comreflectioncache.hpp	2024-05-28 12:53:38.000000000 -0400
-+++ src/runtime/src/coreclr/vm/comreflectioncache.hpp	2025-04-28 21:59:11.041285000 -0400
-@@ -27,4 +27,5 @@
-     void Init();
- 
-+#ifndef DACCESS_COMPILE
-     BOOL GetFromCache(Element *pElement, CacheType& rv)
-     {
-@@ -103,4 +104,5 @@
-         this->LeaveWrite();
-     }
-+#endif // !ACCESS_COMPILE
- 
- private:
-@@ -142,4 +144,5 @@
-     }
- 
-+#ifndef DACCESS_COMPILE
-     void AdjustStamp(BOOL hasWriterLock)
-     {
-@@ -171,4 +174,5 @@
-             this->LeaveWrite();
-     }
-+#endif // !ACCESS_COMPILE
- 
-     void UpdateHashTable(SIZE_T hash, int slot)
diff --git a/lang/dotnet8/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp b/lang/dotnet8/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp
new file mode 100644
index 000000000000..09a320c03831
--- /dev/null
+++ b/lang/dotnet8/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp
@@ -0,0 +1,24 @@
+https://github.com/dotnet/diagnostics/pull/5547
+
+--- src/diagnostics/src/SOS/extensions/hostcoreclr.cpp.orig	2024-05-28 16:53:38 UTC
++++ src/diagnostics/src/SOS/extensions/hostcoreclr.cpp
+@@ -460,11 +460,6 @@ static HRESULT GetHostRuntime(std::string& coreClrPath
+     // If the hosting runtime isn't already set, use the runtime we are debugging
+     if (g_hostRuntimeDirectory == nullptr)
+     {
+-#if defined(HOST_FREEBSD)
+-        TraceError("Hosting on NetBSD not supported\n");
+-        return E_FAIL;
+-#else
+-
+         HRESULT Status = E_FAIL;
+         std::vector<ProbingStrategy> strategyList = {
+              { ProbeEnvVarInstallationHint, RuntimeHostingConstants::DotnetRootArchSpecificEnvVar }
+@@ -527,7 +522,6 @@ static HRESULT GetHostRuntime(std::string& coreClrPath
+     coreClrPath.append(DIRECTORY_SEPARATOR_STR_A);
+     coreClrPath.append(MAKEDLLNAME_A("coreclr"));
+     return S_OK;
+-#endif
+ }
+ 
+ /**********************************************************************\