Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d7c82610
Commit
d7c82610
authored
Sep 23, 2020
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the WolfSSL build on FreeBSD
Port some CMake tweaks of commit
4adc1269
from 10.5.
parent
61df98f9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
extra/wolfssl/CMakeLists.txt
extra/wolfssl/CMakeLists.txt
+3
-3
No files found.
extra/wolfssl/CMakeLists.txt
View file @
d7c82610
IF
(
MSVC
)
IF
(
MSVC
)
PROJECT
(
wolfssl C ASM_MASM
)
PROJECT
(
wolfssl C ASM_MASM
)
ELSEIF
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"x86_64"
)
ELSEIF
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"x86_64
|amd64
"
)
PROJECT
(
wolfssl C ASM
)
PROJECT
(
wolfssl C ASM
)
ELSE
()
ELSE
()
PROJECT
(
wolfssl C
)
PROJECT
(
wolfssl C
)
...
@@ -9,7 +9,7 @@ ENDIF()
...
@@ -9,7 +9,7 @@ ENDIF()
IF
(
CMAKE_SIZEOF_VOID_P MATCHES 8
)
IF
(
CMAKE_SIZEOF_VOID_P MATCHES 8
)
IF
(
MSVC
)
IF
(
MSVC
)
SET
(
WOLFSSL_INTELASM ON
)
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
)
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"
)
MESSAGE_ONCE
(
NO_INTEL_ASSEMBLY
"Disable Intel assembly for WolfSSL - compiler is too old"
)
ELSEIF
(
WITH_MSAN
)
ELSEIF
(
WITH_MSAN
)
...
@@ -121,7 +121,7 @@ IF(WOLFSSL_INTELASM)
...
@@ -121,7 +121,7 @@ IF(WOLFSSL_INTELASM)
IF
(
CMAKE_C_COMPILER_ID MATCHES Clang
)
IF
(
CMAKE_C_COMPILER_ID MATCHES Clang
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-maes -msse4.2 -mpclmul -mrdrnd -mrdseed"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-maes -msse4.2 -mpclmul -mrdrnd -mrdseed"
)
ENDIF
()
ENDIF
()
ELSEIF
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"x86_64"
)
ELSEIF
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"x86_64
|amd64
"
)
SET
(
USE_INTEL_SPEEDUP 1
)
SET
(
USE_INTEL_SPEEDUP 1
)
LIST
(
APPEND WOLFCRYPT_SOURCES
LIST
(
APPEND WOLFCRYPT_SOURCES
${
WOLFCRYPT_SRCDIR
}
/aes_asm.S
${
WOLFCRYPT_SRCDIR
}
/aes_asm.S
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment