diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-03-25 19:45:37 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-03-25 19:45:37 +0100 |
| commit | 98fc6b923f69cd054ef715f918f72da72555bad3 (patch) | |
| tree | 9ae36eee973a054d08c55bc28cf16c9b69d02acb /extra | |
| parent | 3a1075b93ed75c47e3c1e6819a406fcf355bb6fa (diff) | |
| download | mariadb-git-98fc6b923f69cd054ef715f918f72da72555bad3.tar.gz | |
MDEV-20388 : disable inline assembly in WolfSSL if MSAN is on
A desperate attempt to workaround MemorySanitizer deficiencies.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/wolfssl/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
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() |