]> git.ipfire.org Git - thirdparty/vectorscan.git/commitdiff
Fix CROSS_COMPILE_AARCH64 for SVE issues.
authorGeorge Wort <george.wort@arm.com>
Mon, 12 Jul 2021 16:08:11 +0000 (17:08 +0100)
committerKonstantinos Margaritis <konstantinos@vectorcamp.gr>
Tue, 12 Oct 2021 08:51:34 +0000 (11:51 +0300)
Change-Id: I7b9ba3ccb754d96eee22ca01714c783dae1e4956

CMakeLists.txt
src/nfa/truffle.cpp

index 75fee1ec3e5e9a21f08c07266860d45761331748..4d592b6dbb55f9afcc52fffab417bdf753574bec 100644 (file)
@@ -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
index 4df1b5782ea4cd2188a4e7b3ee43579e5df7c1e2..6a8d3c2ee1461940033878bf06a0df10c074bae7 100644 (file)
@@ -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