nvidia jetson build fixes

xmrig · Apr 19, 2019 · 750c148 · 750c148
1 parent ec92207
commit 750c148
Show file tree

Hide file tree

Showing 6 changed files with 2,617 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,7 +128,6 @@ set(SOURCES
     src/common/config/ConfigLoader.cpp
     src/common/config/ConfigWatcher.cpp
     src/common/Console.cpp
-    src/common/cpu/BasicCpuInfo.cpp
     src/common/cpu/Cpu.cpp
     src/common/crypto/Algorithm.cpp
     src/common/crypto/keccak.cpp
@@ -158,6 +157,13 @@ set(SOURCES
     src/xmrig.cpp
    )
 
+if (XMRIG_ARM)
+    set(SOURCES ${SOURCES} src/common/cpu/BasicCpuInfo_arm.cpp)
+else()
+    set(SOURCES ${SOURCES} src/common/cpu/BasicCpuInfo.cpp)
+endif()
+
+
 set(SOURCES_CRYPTO
     src/crypto/c_groestl.c
     src/crypto/c_blake256.c
@@ -166,7 +172,7 @@ set(SOURCES_CRYPTO
     src/crypto/CryptoNight.cpp
    )
 
-if (WITH_ASM)
+if (WITH_ASM AND NOT XMRIG_ARM)
     set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/asm/CryptonightR_template.h)
     set(SOURCES_CRYPTO "${SOURCES_CRYPTO}" src/crypto/CryptonightR_gen.cpp)
 endif()

diff --git a/cmake/flags.cmake b/cmake/flags.cmake
@@ -12,10 +12,19 @@ set(CMAKE_CXX_STANDARD 11)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
+    if (XMRIG_ARM)
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+    else()
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
+    endif()
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wno-strict-aliasing")
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -maes -Wall")
+    if (XMRIG_ARM)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -flax-vector-conversions")
+    else()
+	 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -maes -Wall")
+    endif()
+
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s -Wno-sign-compare")
 
     if (WIN32)
@@ -38,9 +47,18 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
 
 elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
+    if (XMRIG_ARM)
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+    else()
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
+    endif()
+
+    if (XMRIG_ARM)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-exceptions -fno-rtti")
+    else()
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions -fno-rtti")
+    endif()
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions -fno-rtti")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
 
 endif()
diff --git a/src/crypto/CryptoNight.cpp b/src/crypto/CryptoNight.cpp
@@ -34,9 +34,14 @@
 #include "Mem.h"
 #include "crypto/CryptoNight.h"
 #include "crypto/CryptoNight_test.h"
-#include "crypto/CryptoNight_x86.h"
 #include "net/JobResult.h"
 
+#ifdef XMRIG_ARM
+    #include "crypto/CryptoNight_arm.h"
+#else
+    #include "crypto/CryptoNight_x86.h"
+#endif
+
 
 alignas(16) cryptonight_ctx *CryptoNight::m_ctx = nullptr;
 xmrig::Algo CryptoNight::m_algorithm = xmrig::CRYPTONIGHT;