summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoît Ganne <bganne@cisco.com>2019-08-09 14:07:23 +0200
committerDamjan Marion <dmarion@me.com>2019-09-05 15:34:38 +0000
commit5f652e762ec488aeaa1c972dfccc6007e6541b60 (patch)
tree9d4d53f8caff9563c071b9516b4bd4de29bc64b0
parente21bb1e0c209b9d7dffd79623ee289484843d865 (diff)
crypto: add '-maes' compile switch
AES intrinsics use builtins available only with the -maes and GCC 9 just started to enforce it. Type: fix Change-Id: Ia6825ea3eae7191a4bfee47f9fa93fad16ccf76c Signed-off-by: Benoît Ganne <bganne@cisco.com> (cherry picked from commit 561be280feb6a10834bf50e0813cc0ad3c635067)
-rw-r--r--src/plugins/crypto_ia32/CMakeLists.txt2
-rw-r--r--src/plugins/crypto_ipsecmb/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/crypto_ia32/CMakeLists.txt b/src/plugins/crypto_ia32/CMakeLists.txt
index d619076bc8d..cab1c35e0f2 100644
--- a/src/plugins/crypto_ia32/CMakeLists.txt
+++ b/src/plugins/crypto_ia32/CMakeLists.txt
@@ -29,6 +29,6 @@ foreach(VARIANT ${VARIANTS})
set(l crypto_ia32_${v})
add_library(${l} OBJECT aes_cbc.c aes_gcm.c)
set_target_properties(${l} PROPERTIES POSITION_INDEPENDENT_CODE ON)
- target_compile_options(${l} PUBLIC ${f} -Wall -fno-common)
+ target_compile_options(${l} PUBLIC ${f} -Wall -fno-common -maes)
target_sources(crypto_ia32_plugin PRIVATE $<TARGET_OBJECTS:${l}>)
endforeach()
diff --git a/src/plugins/crypto_ipsecmb/CMakeLists.txt b/src/plugins/crypto_ipsecmb/CMakeLists.txt
index 86e33a2ca04..59bfe24e990 100644
--- a/src/plugins/crypto_ipsecmb/CMakeLists.txt
+++ b/src/plugins/crypto_ipsecmb/CMakeLists.txt
@@ -33,7 +33,7 @@ if(IPSECMB_INCLUDE_DIR AND IPSECMB_LIB)
${IPSECMB_LINK_FLAGS}
)
- target_compile_options(crypto_ipsecmb_plugin PRIVATE "-march=silvermont")
+ target_compile_options(crypto_ipsecmb_plugin PRIVATE "-march=silvermont" "-maes")
message(STATUS "Intel IPSecMB found: ${IPSECMB_INCLUDE_DIR}")
else()
message(STATUS "Intel IPSecMB not found")