From ab0d3b8919b8b07c61e25bd868c8bee950fce00f Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Wed, 31 Jul 2019 09:38:27 +0700
Subject: [PATCH] Fixed ARM build with hwloc.

---
 src/backend/cpu/cpu.cmake                     | 4 +++-
 src/backend/cpu/platform/BasicCpuInfo_arm.cpp | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/backend/cpu/cpu.cmake b/src/backend/cpu/cpu.cmake
index 1072df088..2ae73db70 100644
--- a/src/backend/cpu/cpu.cmake
+++ b/src/backend/cpu/cpu.cmake
@@ -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()
diff --git a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp
index 1e6c3cb72..b241e1970 100644
--- a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp
+++ b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp
@@ -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);