From: Damjan Marion <damarion@cisco.com>
Date: Tue, 28 Apr 2020 11:29:37 +0000 (+0200)
Subject: misc: switch to clang-9
X-Git-Tag: v20.09-rc0~93
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=4ba16a44b1f091bacc32fe6fa9f726e9a0d3b0e7;p=vpp.git

misc: switch to clang-9

Type: improvement
Change-Id: Iebf77a63c0c19b130a3fbd26b5293304a9fed4c1
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/Makefile b/Makefile
index 1e6f9ecc6e0..4a547b746f5 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ ifeq ($(OS_VERSION_ID),16.04)
 else ifeq ($(OS_VERSION_ID),18.04)
 	DEB_DEPENDS += python-dev
 	DEB_DEPENDS += libssl-dev
-	DEB_DEPENDS += gcc-8
+	DEB_DEPENDS += gcc-8 clang-9
 else ifeq ($(OS_VERSION_ID),20.04)
 	LIBFFI=libffi7
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 89b4b962fdb..16ae7d5451d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,8 @@
 
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
+set(CMAKE_C_COMPILER_NAMES clang-9 cc)
+
 project(vpp C)
 
 include(CheckCCompilerFlag)
diff --git a/src/plugins/crypto_native/aes.h b/src/plugins/crypto_native/aes.h
index c2c22c6bd16..762d528d064 100644
--- a/src/plugins/crypto_native/aes.h
+++ b/src/plugins/crypto_native/aes.h
@@ -43,7 +43,7 @@ aes_enc_round (u8x16 a, u8x16 k)
 {
 #if defined (__AES__)
   return (u8x16) _mm_aesenc_si128 ((__m128i) a, (__m128i) k);
-#elif defined (__ARM_FEATURE_AES)
+#elif defined (__ARM_FEATURE_CRYPTO)
   return vaesmcq_u8 (vaeseq_u8 (a, u8x16_splat (0))) ^ k;
 #endif
 }
@@ -79,7 +79,7 @@ aes_enc_last_round (u8x16 a, u8x16 k)
 {
 #if defined (__AES__)
   return (u8x16) _mm_aesenclast_si128 ((__m128i) a, (__m128i) k);
-#elif defined (__ARM_FEATURE_AES)
+#elif defined (__ARM_FEATURE_CRYPTO)
   return vaeseq_u8 (a, u8x16_splat (0)) ^ k;
 #endif
 }
@@ -154,7 +154,7 @@ aes_inv_mix_column (u8x16 a)
 {
 #if defined (__AES__)
   return (u8x16) _mm_aesimc_si128 ((__m128i) a);
-#elif defined (__ARM_FEATURE_AES)
+#elif defined (__ARM_FEATURE_CRYPTO)
   return vaesimcq_u8 (a);
 #endif
 }
diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c
index d6a001b5ded..1ef2c5dc960 100644
--- a/src/plugins/dpdk/device/device.c
+++ b/src/plugins/dpdk/device/device.c
@@ -217,7 +217,7 @@ static_always_inline
   return n_left;
 }
 
-static_always_inline void
+static_always_inline __clib_unused void
 dpdk_prefetch_buffer (vlib_main_t * vm, struct rte_mbuf *mb)
 {
   vlib_buffer_t *b = vlib_buffer_from_rte_mbuf (mb);