github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #174 from VectorCamp/develop

Browse Source 
Minor bugfix release 5.4.10.1
This commit is contained in:
Konstantinos Margaritis 2023-09-08 13:42:33 +03:00 committed by GitHub
commit 4918f81ea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/arch.cmake
View File

@ -24,6 +24,9 @@ int main() {
endif () endif ()
if (ARCH_AARCH64) if (ARCH_AARCH64)
if (APPLE)
set (FAT_RUNTIME OFF)
endif()
set(PREV_FLAGS "${CMAKE_C_FLAGS}") set(PREV_FLAGS "${CMAKE_C_FLAGS}")
if (BUILD_SVE2_BITPERM) if (BUILD_SVE2_BITPERM)
set(CMAKE_C_FLAGS "-march=${GNUCC_ARCH} ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-march=${GNUCC_ARCH} ${CMAKE_C_FLAGS}")

14
src/util/arch/arm/cpuid_inline.h
View File

@ -30,7 +30,9 @@
#ifndef AARCH64_CPUID_INLINE_H_ #ifndef AARCH64_CPUID_INLINE_H_
#define AARCH64_CPUID_INLINE_H_ #define AARCH64_CPUID_INLINE_H_
#if defined(__linux__)
#include <sys/auxv.h> #include <sys/auxv.h>
#endif
#include "ue2common.h" #include "ue2common.h"
#include "util/arch/common/cpuid_flags.h" #include "util/arch/common/cpuid_flags.h"
@ -40,6 +42,7 @@ int check_neon(void) {
return 1; return 1;
} }
#if defined(__linux__)
static inline static inline
int check_sve(void) { int check_sve(void) {
unsigned long hwcap = getauxval(AT_HWCAP); unsigned long hwcap = getauxval(AT_HWCAP);
@ -57,5 +60,16 @@ int check_sve2(void) {
} }
return 0; return 0;
} }
#else
static inline
int check_sve(void) {
return 0;
}
static inline
int check_sve2(void) {
return 0;
}
#endif
#endif // AARCH64_CPUID_INLINE_H_ #endif // AARCH64_CPUID_INLINE_H_