summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2018-05-08 13:32:40 +0400
committerSergey Vojtovich <svoj@mariadb.org>2018-05-08 13:32:40 +0400
commitde0e5fe17c9e59fc7e16691b00eb32162a2a1409 (patch)
treeb3af42fe32a0408e80cd8313a34ad82a4f3c066c
parent1025363a35571d5a0ba7023287104d23c7aa61d5 (diff)
downloadmariadb-git-de0e5fe17c9e59fc7e16691b00eb32162a2a1409.tar.gz
MDEV-14541 - Workaround GCC ICE on ARM64
-fno-tree-loop-vectorize is only supported by gcc versions >5.
-rw-r--r--storage/mroonga/vendor/groonga/lib/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
index 2274e95aa24..64fadb8bbdd 100644
--- a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
+++ b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
@@ -179,6 +179,7 @@ if(GRN_WITH_MRUBY)
endif()
# Workaround GCC ICE on ARM64
-IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
+IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" AND
+ CMAKE_C_COMPILER_VERSION VERSION_GREATER "5")
ADD_COMPILE_FLAGS(ts/ts_expr_node.c COMPILE_FLAGS "-fno-tree-loop-vectorize")
ENDIF()