From b3b965a94d8fea68ac475f6eefc35caf297fd806 Mon Sep 17 00:00:00 2001 From: Yuqi Gu Date: Fri, 28 Jun 2019 05:55:57 +0000 Subject: [PATCH] Fix build failure on CentOS for MariaDB official CI The gcc version in CentOS 7 is 4.8.2 (released in Mar 2013). But Arm added the support for 'arm_acle.h' in gcc 5.1 (released in Jun 2014). And there are also some bugs in Arm gcc 4.8. The patch is to detect GCC(greater than 5.1) version for Arm crc32c. Change-Id: I718b9b89f952fed72c8795a176ebbe5395c8dd5e Signed-off-by: Yuqi Gu --- cmake/crc32.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/crc32.cmake b/cmake/crc32.cmake index e81f4d1c273..5a45dde719f 100644 --- a/cmake/crc32.cmake +++ b/cmake/crc32.cmake @@ -1,4 +1,5 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") + IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.1) include(CheckCXXSourceCompiles) CHECK_CXX_SOURCE_COMPILES(" @@ -25,10 +26,11 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") SET(CRC32_LIBRARY crc32_armv8_neon) ADD_SUBDIRECTORY(extra/crc32_armv8_neon) + ENDIF() ENDIF() IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") - SET(HAVE_CRC32_VPMSUM 1) - SET(CRC32_LIBRARY crc32-vpmsum) - ADD_SUBDIRECTORY(extra/crc32-vpmsum) + SET(HAVE_CRC32_VPMSUM 1) + SET(CRC32_LIBRARY crc32-vpmsum) + ADD_SUBDIRECTORY(extra/crc32-vpmsum) ENDIF()