diff options
| -rw-r--r-- | cmake/macros/CheckPlatform.cmake | 2 | ||||
| -rw-r--r-- | dep/argon2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/common/Utilities/SFMTRand.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake index c0a5185b805..5dbd52a8773 100644 --- a/cmake/macros/CheckPlatform.cmake +++ b/cmake/macros/CheckPlatform.cmake @@ -9,7 +9,7 @@ endif() if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") set(TRINITY_SYSTEM_PROCESSOR "amd64") -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM)64$") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM|aarch)64$") set(TRINITY_SYSTEM_PROCESSOR "arm64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM)$") set(TRINITY_SYSTEM_PROCESSOR "arm") diff --git a/dep/argon2/CMakeLists.txt b/dep/argon2/CMakeLists.txt index ad1682088eb..f503afaa6d9 100644 --- a/dep/argon2/CMakeLists.txt +++ b/dep/argon2/CMakeLists.txt @@ -12,10 +12,10 @@ file(GLOB_RECURSE sources *.c) if(TRINITY_SYSTEM_PROCESSOR MATCHES "x86|amd64") list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/argon2/opt.c) + ${CMAKE_CURRENT_SOURCE_DIR}/argon2/ref.c) else() list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/argon2/ref.c) + ${CMAKE_CURRENT_SOURCE_DIR}/argon2/opt.c) endif() add_library(argon2 STATIC diff --git a/src/common/Utilities/SFMTRand.cpp b/src/common/Utilities/SFMTRand.cpp index 6aeb49b9e38..63918fce710 100644 --- a/src/common/Utilities/SFMTRand.cpp +++ b/src/common/Utilities/SFMTRand.cpp @@ -24,7 +24,7 @@ #if __has_include(<mm_malloc.h>) #include <mm_malloc.h> -#elif __has_include(<malloc.h>) +#elif __has_include(<malloc.h>) && TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT #include <malloc.h> #else static __inline__ void *__attribute__((__always_inline__, __nodebug__, __malloc__)) |