Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2025-01-23 03:05:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed ARM build with hwloc.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/backend/cpu/cpu.cmake
View file

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

6
src/backend/cpu/platform/BasicCpuInfo_arm.cpp
View file

@ -36,10 +36,10 @@
xmrig::BasicCpuInfo::BasicCpuInfo() : xmrig::BasicCpuInfo::BasicCpuInfo() :
m_aes(false),
m_brand(), 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 # ifdef XMRIG_ARMv8
memcpy(m_brand, "ARMv8", 5); memcpy(m_brand, "ARMv8", 5);