hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix compilation on macOS aarch64 (#6152)

Browse Source 
* Fix compilation on macOS aarch64
- Bumps rpmalloc submodule to fix assembly compilation, fix `rpmalloc_thread_finalize()` API change
- Adds aarch64 "/opt" Homebrew prefix (reuse `APPLE_PREFIX`)
* Add detection for non-Intel architectures
This commit is contained in:
Tres Finocchiaro
2021-09-22 09:28:16 -04:00
committed by GitHub
parent 8a9a2fae62
commit 131b273894
7 changed files with 92 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/rpmalloc/rpmalloc vendored

Submodule src/3rdparty/rpmalloc/rpmalloc updated: 8d790d2b45...30cc0c7a8c

4
src/core/AudioEngineWorkerThread.cpp
View File

@@ -32,7 +32,7 @@
#include "AudioEngine.h"
#include "ThreadableJob.h"
#if defined(LMMS_HOST_X86) || defined(LMMS_HOST_X86_64)
#if __SSE__
#include <xmmintrin.h>
#endif
@@ -98,7 +98,7 @@ void AudioEngineWorkerThread::JobQueue::wait()
{
while (m_itemsDone < m_writeIndex)
{
#if defined(LMMS_HOST_X86) || defined(LMMS_HOST_X86_64)
#ifdef __SSE__
_mm_pause();
#endif
}

2
src/core/MemoryManager.cpp
View File

@@ -53,7 +53,7 @@ MemoryManager::ThreadGuard::ThreadGuard()
MemoryManager::ThreadGuard::~ThreadGuard()
{
if (--thread_guard_depth == 0) {
rpmalloc_thread_finalize();
rpmalloc_thread_finalize(true);
}
}

4
src/lmmsconfig.h.in
View File

@@ -8,6 +8,10 @@
#cmakedefine LMMS_HOST_X86
#cmakedefine LMMS_HOST_X86_64
#cmakedefine LMMS_HOST_ARM32
#cmakedefine LMMS_HOST_ARM64
#cmakedefine LMMS_HOST_RISCV32
#cmakedefine LMMS_HOST_RISCV64
#cmakedefine LMMS_HAVE_ALSA
#cmakedefine LMMS_HAVE_FLUIDSYNTH