diff --git a/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc b/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc new file mode 100644 index 000000000000..7b0b8cd82099 --- /dev/null +++ b/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc @@ -0,0 +1,14 @@ +--- external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc.orig 2021-06-16 13:17:13 UTC ++++ external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +@@ -24,8 +24,10 @@ + #ifdef __GLIBC__ + #include + #elif defined(__FreeBSD__) +-#include ++#include "absl/base/call_once.h" + #include ++#include ++#include + #endif + #endif + diff --git a/audio/sfizz/files/patch-src_external_atomic__queue_defs.h b/audio/sfizz/files/patch-src_external_atomic__queue_defs.h index 7060dfbfb388..f0bb602e4b16 100644 --- a/audio/sfizz/files/patch-src_external_atomic__queue_defs.h +++ b/audio/sfizz/files/patch-src_external_atomic__queue_defs.h @@ -1,28 +1,39 @@ ---- src/external/atomic_queue/defs.h.orig 2020-04-20 01:14:22 UTC +--- src/external/atomic_queue/defs.h.orig 2020-07-23 22:01:34 UTC +++ src/external/atomic_queue/defs.h @@ -6,11 +6,15 @@ #include +#if defined(__FreeBSD__) || defined(__DragonFly__) +#include // for CACHE_LINE_SIZE +#endif + #if defined(__x86_64__) || defined(_M_X64) || \ defined(__i386__) || defined(_M_IX86) #include namespace atomic_queue { -constexpr int CACHE_LINE_SIZE = 64; +//constexpr int CACHE_LINE_SIZE = 64; static inline void spin_loop_pause() noexcept { _mm_pause(); } @@ -18,7 +22,7 @@ static inline void spin_loop_pause() noexcept { #elif defined(__arm__) || defined(__aarch64__) // TODO: These need to be verified as I do not have access to ARM platform. namespace atomic_queue { -constexpr int CACHE_LINE_SIZE = 64; +//constexpr int CACHE_LINE_SIZE = 64; static inline void spin_loop_pause() noexcept { #if (defined(__ARM_ARCH_6K__) || \ defined(__ARM_ARCH_6Z__) || \ +@@ -37,6 +41,10 @@ static inline void spin_loop_pause() noexcept { + #endif + } + } // namespace atomic_queue ++#elif defined(__powerpc__) ++static inline void spin_loop_pause() noexcept { ++ asm volatile("ori 0,0,0" ::: "memory"); ++} + #else + #error "Unknown CPU architecture." + #endif