Merge pull request #1290 from SChernykh/dev

Fix for 32-bit ARM compilation
This commit is contained in:
xmrig 2019-11-15 22:27:14 +07:00 committed by GitHub
commit ca77fda511
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if defined(_M_X64) || defined(__x86_64__) #if defined(_M_X64) || defined(__x86_64__)
#include "crypto/randomx/jit_compiler_x86_static.hpp" #include "crypto/randomx/jit_compiler_x86_static.hpp"
#elif defined(XMRIG_ARM) #elif defined(XMRIG_ARMv8)
#include "crypto/randomx/jit_compiler_a64_static.hpp" #include "crypto/randomx/jit_compiler_a64_static.hpp"
#endif #endif
@ -201,7 +201,7 @@ void RandomX_ConfigurationBase::Apply()
#define JIT_HANDLE(x, prev) randomx::JitCompilerX86::engine[k] = &randomx::JitCompilerX86::h_##x #define JIT_HANDLE(x, prev) randomx::JitCompilerX86::engine[k] = &randomx::JitCompilerX86::h_##x
#elif defined(XMRIG_ARM) #elif defined(XMRIG_ARMv8)
Log2_ScratchpadL1 = Log2(ScratchpadL1_Size); Log2_ScratchpadL1 = Log2(ScratchpadL1_Size);
Log2_ScratchpadL2 = Log2(ScratchpadL2_Size); Log2_ScratchpadL2 = Log2(ScratchpadL2_Size);

View file

@ -133,7 +133,7 @@ struct RandomX_ConfigurationBase
uint32_t ConditionMask_Calculated; uint32_t ConditionMask_Calculated;
#ifdef XMRIG_ARM #if defined(XMRIG_ARMv8)
uint32_t Log2_ScratchpadL1; uint32_t Log2_ScratchpadL1;
uint32_t Log2_ScratchpadL2; uint32_t Log2_ScratchpadL2;
uint32_t Log2_ScratchpadL3; uint32_t Log2_ScratchpadL3;