fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for MSYS/MINGW

Browse source
This commit is contained in:
SChernykh 2018-09-24 19:31:53 +02:00
parent f4a867b70f
commit 201be4d31b
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmake/asm.cmake
View file

@ -13,6 +13,9 @@ if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
add_library(${XMRIG_ASM_LIBRARY} STATIC add_library(${XMRIG_ASM_LIBRARY} STATIC
"src/crypto/asm/cnv2_main_loop.S" "src/crypto/asm/cnv2_main_loop.S"
) )
if (MSYS OR MINGW)
add_definitions(/DXMRIG_WINDOWS)
endif()
endif() endif()
set(XMRIG_ASM_SOURCES src/crypto/Asm.h src/crypto/Asm.cpp) set(XMRIG_ASM_SOURCES src/crypto/Asm.h src/crypto/Asm.cpp)

8
src/crypto/asm/cnv2_main_loop.S
View file

@ -12,16 +12,24 @@
ALIGN 16 ALIGN 16
FN_PREFIX(cnv2_mainloop_ivybridge_asm): FN_PREFIX(cnv2_mainloop_ivybridge_asm):
#ifndef XMRIG_WINDOWS
sub rsp, 48 sub rsp, 48
mov rcx, rdi mov rcx, rdi
#endif
#include "cnv2_main_loop_ivybridge.inc" #include "cnv2_main_loop_ivybridge.inc"
#ifndef XMRIG_WINDOWS
add rsp, 48 add rsp, 48
#endif
ret 0 ret 0
ALIGN 16 ALIGN 16
FN_PREFIX(cnv2_mainloop_ryzen_asm): FN_PREFIX(cnv2_mainloop_ryzen_asm):
#ifndef XMRIG_WINDOWS
sub rsp, 48 sub rsp, 48
mov rcx, rdi mov rcx, rdi
#endif
#include "cnv2_main_loop_ryzen.inc" #include "cnv2_main_loop_ryzen.inc"
#ifndef XMRIG_WINDOWS
add rsp, 48 add rsp, 48
#endif
ret 0 ret 0