1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build failure on CentOS for MariaDB official CI

Browse Source 
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 <yuqi.gu@arm.com>
This commit is contained in:
Yuqi Gu 2019-06-28 05:55:57 +00:00 committed by Sergey Vojtovich
parent 97c268f864
commit b3b965a94d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/crc32.cmake
View File

@ -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()