[Minor] Limit sse41 code to sse41 and x86_64

diff --git a/contrib/fastutf8/CMakeLists.txt b/contrib/fastutf8/CMakeLists.txt
index f2570bc500650801ad957b4ba647942017a4dd21..2a98ed8154b3535860367a81923479a128513fdd 100644 (file)
--- a/contrib/fastutf8/CMakeLists.txt
+++ b/contrib/fastutf8/CMakeLists.txt
@@ -1,13 +1,11 @@
 SET(UTFSRC ${CMAKE_CURRENT_SOURCE_DIR}/fastutf8.c)
-IF(HAVE_AVX2)
+IF(HAVE_AVX2 AND "${ARCH}" STREQUAL "x86_64")
     SET(UTFSRC ${UTFSRC} ${CMAKE_CURRENT_SOURCE_DIR}/avx2.c)
     MESSAGE(STATUS "UTF8: AVX2 support is added")
 ENDIF()
-IF(HAVE_SSE41)
+IF(HAVE_SSE41 AND "${ARCH}" STREQUAL "x86_64")
     SET(UTFSRC ${UTFSRC} ${CMAKE_CURRENT_SOURCE_DIR}/sse41.c)
     MESSAGE(STATUS "UTF8: SSE41 support is added")
 ENDIF()
 
-CONFIGURE_FILE(platform_config.h.in platform_config.h)
-
 ADD_LIBRARY(rspamd-fastutf8 STATIC ${UTFSRC})
\ No newline at end of file

diff --git a/contrib/fastutf8/fastutf8.c b/contrib/fastutf8/fastutf8.c
index 2a5a9983c99a28a1a2b91089a5de46dadfc89169..89becaf0a037ac244d2e2b9450992770a67eb895 100644 (file)
--- a/contrib/fastutf8/fastutf8.c
+++ b/contrib/fastutf8/fastutf8.c
@@ -23,7 +23,7 @@
  */
 
 #include "fastutf8.h"
-#include "platform_config.h"
+#include "libcryptobox/platform_config.h"
 
 
 /*
@@ -125,10 +125,10 @@ rspamd_fast_utf8_validate_ref (const unsigned char *data, size_t len)
 }
 
 /* Prototypes */
-#ifdef HAVE_SSSE3
+#if defined(HAVE_SSE41) && defined(__x86_64__)
 extern off_t rspamd_fast_utf8_validate_sse41 (const unsigned char *data, size_t len);
 #endif
-#ifdef HAVE_AVX2
+#if defined(HAVE_AVX2) && defined(__x86_64__)
 extern off_t rspamd_fast_utf8_validate_avx2 (const unsigned char *data, size_t len);
 #endif
 
@@ -139,12 +139,12 @@ static off_t (*validate_func) (const unsigned char *data, size_t len) =
 void
 rspamd_fast_utf8_library_init (unsigned flags)
 {
-#ifdef HAVE_SSSE3
+#if defined(HAVE_SSE41) && defined(__x86_64__)
        if (flags & RSPAMD_FAST_UTF8_FLAG_SSE41) {
                validate_func = rspamd_fast_utf8_validate_sse41;
        }
 #endif
-#ifdef HAVE_AVX2
+#if defined(HAVE_AVX2) && defined(__x86_64__)
        if (flags & RSPAMD_FAST_UTF8_FLAG_AVX2) {
                validate_func = rspamd_fast_utf8_validate_avx2;
        }

diff --git a/contrib/fastutf8/platform_config.h.in b/contrib/fastutf8/platform_config.h.in
deleted file mode 100644 (file)
index 621d99e..0000000
--- a/contrib/fastutf8/platform_config.h.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef PLATFORM_H_CONFIG
-#define PLATFORM_H_CONFIG
-
-#define ARCH "${ARCH}"
-#define CMAKE_ARCH_${ARCH} 1
-
-#ifdef __x86_64__
-#cmakedefine HAVE_AVX2 1
-#cmakedefine HAVE_SSE41        1
-#cmakedefine HAVE_SSSE3        1
-#endif
-
-#endif