floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2807 from martin-frbg/issue2804 

Work around ARMV8 build-time cpu detection problems on non-Linux systems
This commit is contained in:
Martin Kroeker 2020-08-31 23:44:56 +02:00 committed by GitHub
parent 59e01b1aec 3210a42734
commit 0a4c5c4c44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/system_check.cmake
View File

@ -54,14 +54,14 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
endif() endif()
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
set(X86 1) set(X86 1)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
set(ARM 1)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(ARM64 1) set(ARM64 1)
else() else()
set(ARM 1) set(ARM 1)
endif() endif()
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
set(ARM 1)
elseif (${CMAKE_CROSSCOMPILING}) elseif (${CMAKE_CROSSCOMPILING})
if (${TARGET} STREQUAL "CORE2") if (${TARGET} STREQUAL "CORE2")
if (NOT BINARY) if (NOT BINARY)

2
cpuid_arm64.c
View File

@ -197,6 +197,8 @@ int detect(void)
} }
#else
return CPU_ARMV8;
#endif #endif
return CPU_UNKNOWN; return CPU_UNKNOWN;