Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 0 insertions, 31 deletions

diff --git a/devel/electron35/files/patch-base_logging__unittest.cc b/devel/electron35/files/patch-base_logging__unittest.cc
deleted file mode 100644
index 801111500f55..000000000000
--- a/devel/electron35/files/patch-base_logging__unittest.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- base/logging_unittest.cc.orig	2025-03-24 20:50:14 UTC
-+++ base/logging_unittest.cc
-@@ -41,7 +41,7 @@
- #include "base/posix/eintr_wrapper.h"
- #endif  // BUILDFLAG(IS_POSIX)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD)
- #include <ucontext.h>
- #endif
- 
-@@ -589,14 +589,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
-   // need the arch-specific boilerplate below, which is inspired by breakpad.
-   // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
-   uintptr_t crash_addr = 0;
--#if BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FREEBSD)
-   crash_addr = reinterpret_cast<uintptr_t>(info->si_addr);
- #else  // OS_*
-   ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr);
- #if defined(ARCH_CPU_X86)
-   crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_EIP]);
- #elif defined(ARCH_CPU_X86_64)
-+#if BUILDFLAG(IS_OPENBSD)
-+  crash_addr = static_cast<uintptr_t>(context->sc_rip);
-+#else
-   crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_RIP]);
-+#endif
- #elif defined(ARCH_CPU_ARMEL)
-   crash_addr = static_cast<uintptr_t>(context->uc_mcontext.arm_pc);
- #elif defined(ARCH_CPU_ARM64)