Merge branch 'master' of git@github.com:tevador/RandomX.git

2018-12-13 23:16:04 +01:00 · 2018-12-13 23:16:04 +01:00 · d6ca408ce2
parent cb0721056a 52beccc309
commit d6ca408ce2
1 changed files with 2 additions and 2 deletions
--- a/src/softAes.cpp
+++ b/src/softAes.cpp
@ -328,7 +328,7 @@ static inline uint32_t subw(uint32_t w) {
 		sbox[w & 0xff];
 }

-#if defined(__clang__) || defined(__arm__)
+#if defined(__clang__) || defined(__arm__) || defined(__aarch64__)
 static inline uint32_t _rotr(uint32_t value, uint32_t amount) {
 	return (value >> amount) | (value << (-amount & 31));
 }
@ -374,4 +374,4 @@ __m128i soft_aesdec(__m128i in, __m128i key) {
 	);

 	return _mm_xor_si128(out, key);
-}
+}