Fixed ARM build with hwloc.

This commit is contained in:
XMRig 2019-07-31 09:38:27 +07:00
parent c138161ee2
commit ab0d3b8919
2 changed files with 6 additions and 4 deletions

View file

@ -39,7 +39,6 @@ if (WITH_HWLOC)
endif()
set(SOURCES_CPUID
src/backend/cpu/platform/BasicCpuInfo.cpp
src/backend/cpu/platform/BasicCpuInfo.h
src/backend/cpu/platform/HwlocCpuInfo.cpp
src/backend/cpu/platform/HwlocCpuInfo.h
@ -66,7 +65,10 @@ else()
set(SOURCES_CPUID
src/backend/cpu/platform/BasicCpuInfo.h
)
endif()
if (NOT WITH_LIBCPUID)
if (XMRIG_ARM)
set(SOURCES_CPUID ${SOURCES_CPUID} src/backend/cpu/platform/BasicCpuInfo_arm.cpp)
else()

View file

@ -36,10 +36,10 @@
xmrig::BasicCpuInfo::BasicCpuInfo() :
m_aes(false),
m_brand(),
m_avx2(false),
m_threads(std::thread::hardware_concurrency())
m_threads(std::thread::hardware_concurrency()),
m_aes(false),
m_avx2(false)
{
# ifdef XMRIG_ARMv8
memcpy(m_brand, "ARMv8", 5);