Merge pull request #174 from VectorCamp/develop

Minor bugfix release 5.4.10.1
VectorCamp · Sep 8, 2023 · 4918f81 · 4918f81
2 parents ad42abe + adedf2a
commit 4918f81
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/cmake/arch.cmake b/cmake/arch.cmake
@@ -24,6 +24,9 @@ int main() {
 endif ()
 
 if (ARCH_AARCH64)
+ if (APPLE)
+ set (FAT_RUNTIME OFF)
+ endif()
  set(PREV_FLAGS "${CMAKE_C_FLAGS}")
  if (BUILD_SVE2_BITPERM)
  set(CMAKE_C_FLAGS "-march=${GNUCC_ARCH} ${CMAKE_C_FLAGS}")

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