From 98fc6b923f69cd054ef715f918f72da72555bad3 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 25 Mar 2020 19:45:37 +0100 Subject: MDEV-20388 : disable inline assembly in WolfSSL if MSAN is on A desperate attempt to workaround MemorySanitizer deficiencies. --- extra/wolfssl/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'extra') diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index dced917169a..e2ba345e3c8 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -12,13 +12,16 @@ IF(MSVC) ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") 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) + MESSAGE_ONCE(MSAN_CANT_HANDLE_IT + "Disable Intel assembly for WolfSSL - MSAN can't handle it") ELSE() MY_CHECK_C_COMPILER_FLAG(-maes) MY_CHECK_C_COMPILER_FLAG(-msse4) MY_CHECK_C_COMPILER_FLAG(-mpclmul) - ENDIF() - IF(have_C__maes AND have_C__msse4 AND have_C__mpclmul) - SET(WOLFSSL_INTELASM ON) + IF(have_C__maes AND have_C__msse4 AND have_C__mpclmul) + SET(WOLFSSL_INTELASM ON) + ENDIF() ENDIF() ENDIF() ENDIF() -- cgit v1.2.1