[dpdk-stable] patch 'acl: fix x86 build for compiler without AVX2' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From eb7f3f43bcb3dcf02d266795bebf8d77d8fe0fa9 Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev at intel.com>
Date: Tue, 6 Oct 2020 16:03:03 +0100
Subject: [PATCH] acl: fix x86 build for compiler without AVX2

[ upstream commit 85348c3e7dd5019e4d2f738c7492bc4c9d4bf9d2 ]

Right now we define dummy version of rte_acl_classify_avx2()
when both X86 and AVX2 are not detected, though it should be
for non-AVX2 case only.

Fixes: e53ce4e41379 ("acl: remove use of weak functions")

Signed-off-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_acl/rte_acl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c
index 777ec4d340..715b023592 100644
--- a/lib/librte_acl/rte_acl.c
+++ b/lib/librte_acl/rte_acl.c
@@ -16,7 +16,6 @@ static struct rte_tailq_elem rte_acl_tailq = {
 };
 EAL_REGISTER_TAILQ(rte_acl_tailq)
 
-#ifndef RTE_ARCH_X86
 #ifndef CC_AVX2_SUPPORT
 /*
  * If the compiler doesn't support AVX2 instructions,
@@ -33,6 +32,7 @@ rte_acl_classify_avx2(__rte_unused const struct rte_acl_ctx *ctx,
 }
 #endif
 
+#ifndef RTE_ARCH_X86
 int
 rte_acl_classify_sse(__rte_unused const struct rte_acl_ctx *ctx,
 	__rte_unused const uint8_t **data,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:16.024790640 +0000
+++ 0138-acl-fix-x86-build-for-compiler-without-AVX2.patch	2020-10-28 10:35:11.708833026 +0000
@@ -1,14 +1,15 @@
-From 85348c3e7dd5019e4d2f738c7492bc4c9d4bf9d2 Mon Sep 17 00:00:00 2001
+From eb7f3f43bcb3dcf02d266795bebf8d77d8fe0fa9 Mon Sep 17 00:00:00 2001
 From: Konstantin Ananyev <konstantin.ananyev at intel.com>
 Date: Tue, 6 Oct 2020 16:03:03 +0100
 Subject: [PATCH] acl: fix x86 build for compiler without AVX2
 
+[ upstream commit 85348c3e7dd5019e4d2f738c7492bc4c9d4bf9d2 ]
+
 Right now we define dummy version of rte_acl_classify_avx2()
 when both X86 and AVX2 are not detected, though it should be
 for non-AVX2 case only.
 
 Fixes: e53ce4e41379 ("acl: remove use of weak functions")
-Cc: stable at dpdk.org
 
 Signed-off-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
 Reviewed-by: David Marchand <david.marchand at redhat.com>
@@ -17,7 +18,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c
-index e2c1ed4ad0..aa430a378d 100644
+index 777ec4d340..715b023592 100644
 --- a/lib/librte_acl/rte_acl.c
 +++ b/lib/librte_acl/rte_acl.c
 @@ -16,7 +16,6 @@ static struct rte_tailq_elem rte_acl_tailq = {