Merge xmrig v6.11.0 into master

This commit is contained in:
MoneroOcean 2021-04-06 15:17:08 +00:00
commit fd8ed2c6a6
41 changed files with 760 additions and 275 deletions

View file

@ -49,13 +49,13 @@ if (WITH_RANDOMX)
src/crypto/randomx/panthera/yespower-opt.c
)
if (CMAKE_C_COMPILER_ID MATCHES MSVC)
if (WITH_ASM AND CMAKE_C_COMPILER_ID MATCHES MSVC)
enable_language(ASM_MASM)
list(APPEND SOURCES_CRYPTO
src/crypto/randomx/jit_compiler_x86_static.asm
src/crypto/randomx/jit_compiler_x86.cpp
)
elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
elseif (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND SOURCES_CRYPTO
src/crypto/randomx/jit_compiler_x86_static.S
src/crypto/randomx/jit_compiler_x86.cpp