From 201be4d31bed9e4dc2dd6e9071fc5ed1d3ed8b42 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Mon, 24 Sep 2018 19:31:53 +0200 Subject: [PATCH] Fix for MSYS/MINGW --- cmake/asm.cmake | 3 +++ src/crypto/asm/cnv2_main_loop.S | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/cmake/asm.cmake b/cmake/asm.cmake index d6c88e99..f0610224 100644 --- a/cmake/asm.cmake +++ b/cmake/asm.cmake @@ -13,6 +13,9 @@ if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) add_library(${XMRIG_ASM_LIBRARY} STATIC "src/crypto/asm/cnv2_main_loop.S" ) + if (MSYS OR MINGW) + add_definitions(/DXMRIG_WINDOWS) + endif() endif() set(XMRIG_ASM_SOURCES src/crypto/Asm.h src/crypto/Asm.cpp) diff --git a/src/crypto/asm/cnv2_main_loop.S b/src/crypto/asm/cnv2_main_loop.S index 580a4588..9c1aaaef 100644 --- a/src/crypto/asm/cnv2_main_loop.S +++ b/src/crypto/asm/cnv2_main_loop.S @@ -12,16 +12,24 @@ ALIGN 16 FN_PREFIX(cnv2_mainloop_ivybridge_asm): +#ifndef XMRIG_WINDOWS sub rsp, 48 mov rcx, rdi +#endif #include "cnv2_main_loop_ivybridge.inc" +#ifndef XMRIG_WINDOWS add rsp, 48 +#endif ret 0 ALIGN 16 FN_PREFIX(cnv2_mainloop_ryzen_asm): +#ifndef XMRIG_WINDOWS sub rsp, 48 mov rcx, rdi +#endif #include "cnv2_main_loop_ryzen.inc" +#ifndef XMRIG_WINDOWS add rsp, 48 +#endif ret 0