Try to fix AArch64 cross compile

DynamoRIO · Aug 16, 2023 · 7f939de · 7f939de
1 parent ab5128c
commit 7f939de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -624,7 +624,7 @@ endif ()
 set(proc_supports_sve OFF)
 if (AARCH64 AND UNIX)
   set(CFLAGS_SVE "-march=armv8-a+sve")
-  check_sve_processor_and_compiler_support(proc_supports_sve)
+  check_sve_compiler_support(proc_supports_sve)
 endif ()
 
 # Ensure that _AMD64_ or _X86_ are defined on Microsoft Windows, as otherwise

diff --git a/make/utils.cmake b/make/utils.cmake
@@ -314,8 +314,8 @@ if (UNIX)
 
 endif (UNIX)
 
-function (check_sve_processor_and_compiler_support out)
-  include(CheckCSourceRuns)
+function (check_sve_compiler_support out)
+  include(CheckCSourceCompiles)
   set(sve_prog "#include <stdint.h>
                 int main() {
                     uint64_t vl = 0;
@@ -324,12 +324,11 @@ function (check_sve_processor_and_compiler_support out)
                     return 0;
                  }")
   set(CMAKE_REQUIRED_FLAGS ${CFLAGS_SVE})
-  check_c_source_runs("${sve_prog}" proc_found_sve)
+  check_c_source_compiles("${sve_prog}" proc_found_sve)
   if (proc_found_sve)
-    message(STATUS "Compiler and processor support SVE.")
+    message(STATUS "Compiler supports SVE.")
   else ()
-    message(STATUS "WARNING: Compiler or processor do not support SVE. "
-                   "Skipping tests")
+    message(STATUS "WARNING: Compiler does not support SVE. Skipping tests")
   endif ()
   set(${out} ${proc_found_sve} PARENT_SCOPE)
-endfunction (check_sve_processor_and_compiler_support)
+endfunction (check_sve_compiler_support)