From d7c82610c14f5102258640c73c1d78ea22f942c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 23 Sep 2020 09:29:05 +0300 Subject: Fix the WolfSSL build on FreeBSD Port some CMake tweaks of commit 4adc1269cc2d487bb12f96b0827c4a74f1a05382 from 10.5. --- extra/wolfssl/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extra/wolfssl') diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index 12eb26c9ef7..953d377ebcf 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -1,6 +1,6 @@ IF(MSVC) PROJECT(wolfssl C ASM_MASM) -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") +ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") PROJECT(wolfssl C ASM) ELSE() PROJECT(wolfssl C) @@ -9,7 +9,7 @@ ENDIF() IF(CMAKE_SIZEOF_VOID_P MATCHES 8) IF(MSVC) SET(WOLFSSL_INTELASM ON) -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") +ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") IF(CMAKE_C_COMPILER_ID MATCHES GNU AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) MESSAGE_ONCE(NO_INTEL_ASSEMBLY "Disable Intel assembly for WolfSSL - compiler is too old") ELSEIF(WITH_MSAN) @@ -121,7 +121,7 @@ IF(WOLFSSL_INTELASM) IF(CMAKE_C_COMPILER_ID MATCHES Clang) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -msse4.2 -mpclmul -mrdrnd -mrdseed") ENDIF() - ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") + ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") SET(USE_INTEL_SPEEDUP 1) LIST(APPEND WOLFCRYPT_SOURCES ${WOLFCRYPT_SRCDIR}/aes_asm.S -- cgit v1.2.1