Enable CMake CRC32 / CRYPTO tests for aarch64 with Clang

Author: brad0

mysys/CMakeLists.txt

@@ -79,10 +79,16 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|i386|i686")
     ENDIF()
   ENDIF()
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
-  IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
-    include(CheckCXXSourceCompiles)
+  IF(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
+    include(CheckCSourceCompiles)
 
-    CHECK_CXX_SOURCE_COMPILES("
+    CHECK_C_COMPILER_FLAG(-march=armv8-a+crc+crypto HAVE_ARMV8_CRC_CRYPTO_MARCH)
+    IF(HAVE_ARMV8_CRC_CRYPTO_MARCH)
+      SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+      SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -march=armv8-a+crc+crypto")
+    ENDIF()
+
+    CHECK_C_SOURCE_COMPILES("
     #define CRC32CX(crc, value) __asm__(\"crc32cx %w[c], %w[c], %x[v]\":[c]\"+r\"(crc):[v]\"r\"(value))
     asm(\".arch_extension crc\");
     unsigned int foo(unsigned int ret) {
@@ -99,7 +105,7 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
     #endif
     }" HAVE_ARMV8_CRC)
 
-    CHECK_CXX_SOURCE_COMPILES("
+    CHECK_C_SOURCE_COMPILES("
     asm(\".arch_extension crypto\");
     unsigned int foo(unsigned int ret) {
       __asm__(\"pmull  v2.1q,          v2.1d,  v1.1d\");
@@ -115,10 +121,8 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
     #endif
     }" HAVE_ARMV8_CRYPTO)
 
-    CHECK_C_COMPILER_FLAG(-march=armv8-a+crc+crypto HAVE_ARMV8_CRC_CRYPTO_MARCH)
-
     IF(HAVE_ARMV8_CRC_CRYPTO_MARCH)
-      CHECK_INCLUDE_FILE(arm_acle.h HAVE_ARM_ACLE_H -march=armv8-a+crc+crypto)
+      CHECK_INCLUDE_FILE(arm_acle.h HAVE_ARM_ACLE_H)
       IF(HAVE_ARM_ACLE_H)
        ADD_DEFINITIONS(-DHAVE_ARMV8_CRC_CRYPTO_INTRINSICS)
       ENDIF()
@@ -131,6 +135,8 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
       SET(MYSYS_SOURCES ${MYSYS_SOURCES} crc32/crc32_arm64.c)
       SET_SOURCE_FILES_PROPERTIES(crc32/crc32_arm64.c PROPERTIES
         COMPILE_FLAGS "-march=armv8-a+crc+crypto")
+
+      SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
     ENDIF()
   ENDIF()
 ENDIF()