Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for ARM/NVIDIA Jetson #268

Merged
merged 1 commit into from
May 8, 2019
Merged

Fix for ARM/NVIDIA Jetson #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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()
Expand Down
26 changes: 22 additions & 4 deletions cmake/flags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
7 changes: 6 additions & 1 deletion src/crypto/CryptoNight.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading