diff options
Diffstat (limited to 'devel/folly/files')
6 files changed, 34 insertions, 8 deletions
diff --git a/devel/folly/files/patch-CMake_folly-deps.cmake b/devel/folly/files/patch-CMake_folly-deps.cmake index 81b4bef17993..e20c5eedf73e 100644 --- a/devel/folly/files/patch-CMake_folly-deps.cmake +++ b/devel/folly/files/patch-CMake_folly-deps.cmake @@ -1,6 +1,6 @@ ---- CMake/folly-deps.cmake.orig 2024-07-06 16:18:12 UTC +--- CMake/folly-deps.cmake.orig 2025-11-02 05:43:14 UTC +++ CMake/folly-deps.cmake -@@ -174,7 +174,7 @@ if (NOT WIN32 AND NOT APPLE) +@@ -175,7 +175,7 @@ if (NOT WIN32 AND NOT APPLE) set(FOLLY_HAVE_BACKTRACE ${Backtrace_FOUND}) set(FOLLY_HAVE_DWARF ${LIBDWARF_FOUND}) if (NOT WIN32 AND NOT APPLE) diff --git a/devel/folly/files/patch-folly_CMakeLists.txt b/devel/folly/files/patch-folly_CMakeLists.txt index 4986e0e47e00..d8eff71896d2 100644 --- a/devel/folly/files/patch-folly_CMakeLists.txt +++ b/devel/folly/files/patch-folly_CMakeLists.txt @@ -1,6 +1,6 @@ ---- folly/CMakeLists.txt.orig 2024-07-06 16:18:12 UTC +--- folly/CMakeLists.txt.orig 2025-11-02 05:43:14 UTC +++ folly/CMakeLists.txt -@@ -29,7 +29,9 @@ add_subdirectory(debugging/exception_tracer) +@@ -30,7 +30,9 @@ add_subdirectory(debugging/exception_tracer) ) add_subdirectory(debugging/exception_tracer) diff --git a/devel/folly/files/patch-folly_FollyMemset.cpp b/devel/folly/files/patch-folly_FollyMemset.cpp index b3f0c4325129..be77ca843172 100644 --- a/devel/folly/files/patch-folly_FollyMemset.cpp +++ b/devel/folly/files/patch-folly_FollyMemset.cpp @@ -1,8 +1,8 @@ ---- folly/FollyMemset.cpp.orig 2024-09-24 17:45:52 UTC +--- folly/FollyMemset.cpp.orig 2025-11-02 05:43:14 UTC +++ folly/FollyMemset.cpp @@ -16,7 +16,7 @@ - #include <cstring> + #include <cstring> // @donotremove -#if !defined(__AVX2__) && !(defined(__linux__) && defined(__aarch64__)) +#if !defined(__AVX2__) && !((defined(__linux__) || defined(__FreeBSD__)) && defined(__aarch64__)) diff --git a/devel/folly/files/patch-folly_debugging_symbolizer_SignalHandler.cpp b/devel/folly/files/patch-folly_debugging_symbolizer_SignalHandler.cpp new file mode 100644 index 000000000000..eec186652bf2 --- /dev/null +++ b/devel/folly/files/patch-folly_debugging_symbolizer_SignalHandler.cpp @@ -0,0 +1,15 @@ +--- folly/debugging/symbolizer/SignalHandler.cpp.orig 2025-11-05 08:46:58 UTC ++++ folly/debugging/symbolizer/SignalHandler.cpp +@@ -159,7 +159,12 @@ bool try_async_reraise(int signum, siginfo_t* info) { + if (errno != EBADF) { // EBADF here means PIDFD_SELF is not yet supported + return false; + } ++#if defined(__linux__) + auto const tid = linux_syscall(FOLLY_SYS_gettid); ++#elif defined(__FreeBSD__) ++ long tid = 0; ++ syscall(432, &tid); ++#endif + // pidfd_open introduced in linux-5.3 (released 2019-09-15) + int const fd = to_narrow(linux_syscall(nr_pidfd_open, tid, 0)); + if (-1 == fd) { diff --git a/devel/folly/files/patch-folly_debugging_symbolizer_Symbolizer.cpp b/devel/folly/files/patch-folly_debugging_symbolizer_Symbolizer.cpp new file mode 100644 index 000000000000..3a638549f8ed --- /dev/null +++ b/devel/folly/files/patch-folly_debugging_symbolizer_Symbolizer.cpp @@ -0,0 +1,11 @@ +--- folly/debugging/symbolizer/Symbolizer.cpp.orig 2025-11-05 09:24:00 UTC ++++ folly/debugging/symbolizer/Symbolizer.cpp +@@ -348,7 +348,7 @@ void ElfCache::Symbolizer::symbolize( + // Get the unrelocated, ELF-relative address by normalizing via the + // address at which the object is loaded. + auto const eaddr = static_cast<ElfAddr>(addr); +- auto const maddr = lmap->l_addr; ++ auto const maddr = reinterpret_cast<ElfAddr>(lmap->l_addr); + auto const adjusted = eaddr < maddr ? ~ElfAddr(0) : eaddr - maddr; + size_t numInlined = 0; + if (containedInExecutableSegment(*elfFile, adjusted)) { diff --git a/devel/folly/files/patch-folly_executors_QueueObserver.h b/devel/folly/files/patch-folly_executors_QueueObserver.h index 93aa3e840f4c..809c608d9c27 100644 --- a/devel/folly/files/patch-folly_executors_QueueObserver.h +++ b/devel/folly/files/patch-folly_executors_QueueObserver.h @@ -1,8 +1,8 @@ - workaround for https://github.com/facebook/folly/issues/1637 ---- folly/executors/QueueObserver.h.orig 2022-11-25 05:13:23 UTC +--- folly/executors/QueueObserver.h.orig 2025-11-02 05:43:14 UTC +++ folly/executors/QueueObserver.h -@@ -26,6 +26,8 @@ +@@ -29,6 +29,8 @@ #include <folly/Synchronized.h> #include <folly/portability/SysTypes.h> |