Merge pull request #1845 from SChernykh/dev

Fix for ARM compilation
This commit is contained in:
xmrig 2020-09-23 16:48:08 +07:00 committed by GitHub
commit e4929d7c06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -337,12 +337,16 @@ typedef void(randomx::JitCompilerX86::* InstructionGeneratorX86_2)(const randomx
INST_HANDLE(FDIV_M, FMUL_R); INST_HANDLE(FDIV_M, FMUL_R);
INST_HANDLE(FSQRT_R, FDIV_M); INST_HANDLE(FSQRT_R, FDIV_M);
#if defined(_M_X64) || defined(__x86_64__)
if (xmrig::Cpu::info()->jccErratum()) { if (xmrig::Cpu::info()->jccErratum()) {
INST_HANDLE2(CBRANCH, CBRANCH<true>, FSQRT_R); INST_HANDLE2(CBRANCH, CBRANCH<true>, FSQRT_R);
} }
else { else {
INST_HANDLE2(CBRANCH, CBRANCH<false>, FSQRT_R); INST_HANDLE2(CBRANCH, CBRANCH<false>, FSQRT_R);
} }
#else
INST_HANDLE(CBRANCH, FSQRT_R);
#endif
#if defined(_M_X64) || defined(__x86_64__) #if defined(_M_X64) || defined(__x86_64__)
if (xmrig::Cpu::info()->hasBMI2()) { if (xmrig::Cpu::info()->hasBMI2()) {