Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2024-12-23 20:19:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2233 from SChernykh/dev

Browse source 
Fixed compilation for ARM
This commit is contained in:
xmrig 2021-04-03 23:03:05 +07:00 committed by GitHub
commit 277352d072
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/randomx.cmake
View file

@ -55,7 +55,7 @@ if (WITH_RANDOMX)
) )
# cheat because cmake and ccache hate each other # cheat because cmake and ccache hate each other
set_property(SOURCE src/crypto/randomx/jit_compiler_x86_static.S PROPERTY LANGUAGE C) set_property(SOURCE src/crypto/randomx/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
elseif (WITH_ASM AND XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) elseif (XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND SOURCES_CRYPTO list(APPEND SOURCES_CRYPTO
src/crypto/randomx/jit_compiler_a64_static.S src/crypto/randomx/jit_compiler_a64_static.S
src/crypto/randomx/jit_compiler_a64.cpp src/crypto/randomx/jit_compiler_a64.cpp

2
src/crypto/randomx/common.hpp
View file

@ -107,7 +107,7 @@ namespace randomx {
#define RANDOMX_HAVE_COMPILER 1 #define RANDOMX_HAVE_COMPILER 1
class JitCompilerX86; class JitCompilerX86;
using JitCompiler = JitCompilerX86; using JitCompiler = JitCompilerX86;
#elif defined(XMRIG_FEATURE_ASM) && defined(__aarch64__) #elif defined(__aarch64__)
#define RANDOMX_HAVE_COMPILER 1 #define RANDOMX_HAVE_COMPILER 1
class JitCompilerA64; class JitCompilerA64;
using JitCompiler = JitCompilerA64; using JitCompiler = JitCompilerA64;

2
src/crypto/randomx/jit_compiler.hpp
View file

@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if defined(XMRIG_FEATURE_ASM) && (defined(_M_X64) || defined(__x86_64__)) #if defined(XMRIG_FEATURE_ASM) && (defined(_M_X64) || defined(__x86_64__))
#include "crypto/randomx/jit_compiler_x86.hpp" #include "crypto/randomx/jit_compiler_x86.hpp"
#elif defined(XMRIG_FEATURE_ASM) && defined(__aarch64__) #elif defined(__aarch64__)
#include "crypto/randomx/jit_compiler_a64.hpp" #include "crypto/randomx/jit_compiler_a64.hpp"
#else #else
#include "crypto/randomx/jit_compiler_fallback.hpp" #include "crypto/randomx/jit_compiler_fallback.hpp"

2
src/crypto/randomx/randomx.cpp
View file

@ -262,7 +262,7 @@ typedef void(randomx::JitCompilerX86::* InstructionGeneratorX86_2)(const randomx
memcpy(randomx::JitCompilerX86::engine + k, &p, sizeof(p)); \ memcpy(randomx::JitCompilerX86::engine + k, &p, sizeof(p)); \
} while (0) } while (0)
#elif defined(XMRIG_FEATURE_ASM) && defined(XMRIG_ARMv8) #elif defined(XMRIG_ARMv8)
Log2_ScratchpadL1 = Log2(ScratchpadL1_Size); Log2_ScratchpadL1 = Log2(ScratchpadL1_Size);
Log2_ScratchpadL2 = Log2(ScratchpadL2_Size); Log2_ScratchpadL2 = Log2(ScratchpadL2_Size);