diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-02 14:39:43 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-02 14:39:43 +0200 |
| commit | 172ce659c1a7d96cc6cf22687a4a6d227ea5af6f (patch) | |
| tree | 29dc0ff37f8856ad4a2e29b3e3a692e57a01597c | |
| parent | 1bf9acceef252000618a137853638c612339024b (diff) | |
| download | mariadb-git-bb-10.5-MDEV-24514.tar.gz | |
MDEV-24514 WITH_MSAN is disabling WOLFSSL_AESNI accelerationbb-10.5-MDEV-24514
WolfSSL is the WITH_SSL=bundled library since MDEV-18351.
For the AMD64 architecture, the library includes some assembler code.
That code was disabled in WITH_MSAN builds, because MemorySanitizer
would consider any data that is computed by uninstrumented code to
be uninitialized.
| -rw-r--r-- | extra/wolfssl/CMakeLists.txt | 15 | ||||
| m--------- | extra/wolfssl/wolfssl | 0 |
2 files changed, 5 insertions, 10 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index c99fb155dd6..f3b1c2af2c3 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -17,16 +17,11 @@ 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") ELSE() - IF(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) - IF(have_C__maes AND have_C__msse4 AND have_C__mpclmul) - SET(WOLFSSL_INTELASM ON) - ENDIF() + MY_CHECK_C_COMPILER_FLAG(-maes) + MY_CHECK_C_COMPILER_FLAG(-msse4) + MY_CHECK_C_COMPILER_FLAG(-mpclmul) + IF(have_C__maes AND have_C__msse4 AND have_C__mpclmul) + SET(WOLFSSL_INTELASM ON) ENDIF() MY_CHECK_C_COMPILER_FLAG(-mrdrnd) MY_CHECK_C_COMPILER_FLAG(-mrdseed) diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl -Subproject 9c87f979a7f1d3a6d786b260653d566c1d31a1c +Subproject 57d8e919fc27e8762d8eaed29b33509b19a14a9 |