From: Benoît Ganne <bganne@cisco.com>
Date: Fri, 9 Aug 2019 12:07:23 +0000 (+0200)
Subject: crypto: add '-maes' compile switch
X-Git-Tag: v20.05-rc0~1015
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=561be280feb6a10834bf50e0813cc0ad3c635067;p=vpp.git

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>
---

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")