Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build: Fix Linux aarch64 GCC build (#29831)

Browse Source
This commit is contained in:
lee
2024-03-27 17:50:07 +08:00
committed by GitHub
parent 6a54dc5a34
commit 370685457e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/macros/CheckPlatform.cmake
View File

@@ -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")

4
dep/argon2/CMakeLists.txt
View File

@@ -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

2
src/common/Utilities/SFMTRand.cpp
View File

@@ -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__))