From: George Wort <george.wort@arm.com>
Date: Mon, 12 Jul 2021 16:08:11 +0000 (+0100)
Subject: Fix CROSS_COMPILE_AARCH64 for SVE issues.
X-Git-Tag: v5.4.3+vectorscan~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bc28272da993d4cb5b2eabe67ce062666667dbc;p=thirdparty%2Fvectorscan.git

Fix CROSS_COMPILE_AARCH64 for SVE issues.

Change-Id: I7b9ba3ccb754d96eee22ca01714c783dae1e4956
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75fee1ec..4d592b6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,7 +184,7 @@ else()
         string(REGEX REPLACE "-O[^ ]*" "" CMAKE_CXX_FLAGS_${CONFIG} "${CMAKE_CXX_FLAGS_${CONFIG}}")
     endforeach ()
 
-    if (CMAKE_COMPILER_IS_GNUCC)
+    if (CMAKE_COMPILER_IS_GNUCC AND NOT CROSS_COMPILE_AARCH64)
         message(STATUS "gcc version ${CMAKE_C_COMPILER_VERSION}")
         # If gcc doesn't recognise the host cpu, then mtune=native becomes
         # generic, which isn't very good in some cases. march=native looks at
diff --git a/src/nfa/truffle.cpp b/src/nfa/truffle.cpp
index 4df1b578..6a8d3c2e 100644
--- a/src/nfa/truffle.cpp
+++ b/src/nfa/truffle.cpp
@@ -37,7 +37,6 @@
 #include "util/arch.h"
 #include "util/bitutils.h"
 
-#if !defined(HAVE_SVE)
 #include "truffle_simd.hpp"
 
 const u8 *truffleExec(m128 mask_lo, m128 mask_hi, const u8 *buf,
@@ -49,5 +48,3 @@ const u8 *rtruffleExec(m128 mask_lo, m128 mask_hi, const u8 *buf,
                        const u8 *buf_end) {
     return rtruffleExecReal<VECTORSIZE>(mask_lo, mask_hi, buf, buf_end);
 }
-
-#endif