diff options
| author | lee <leelf_00@126.com> | 2024-03-27 17:50:07 +0800 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2024-03-28 20:27:25 +0100 |
| commit | a9813ee6bb7d551c2c1b112e7edb4f732a46a13c (patch) | |
| tree | c81f6e5d43a6a6ca2cd8b2a0034fcaa9ecb46768 | |
| parent | 8a673d7a0f128a0dfcfbea5be6ef486442ada19b (diff) | |
Build: Fix Linux aarch64 GCC build (#29831)
(cherry picked from commit 370685457e83c9657c1337ea5a2dc2f07e01af62)
(cherry picked from commit 5c4b1ace41b417539ed0abfec7475c23765e81c9)
| -rw-r--r-- | cmake/macros/CheckPlatform.cmake | 2 | ||||
| -rw-r--r-- | src/common/Utilities/SFMTRand.cpp | 2 |
2 files changed, 2 insertions, 2 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/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__)) |