[dpdk-stable] patch 'net/mlx: fix debug build with icc' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 12/16/19. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/5f113254fee556d16a6b93f286e4c9d507a96110

Thanks.

Kevin.

---
>From 5f113254fee556d16a6b93f286e4c9d507a96110 Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland at mellanox.com>
Date: Wed, 23 Oct 2019 11:31:45 +0000
Subject: [PATCH] net/mlx: fix debug build with icc

[ upstream commit 38e118c0d8304190d4f24297fe2279a7b658c071 ]

Trying to compile mlx5 pmd in debug mode with icc
will lead to compilation failures due to the fact that
icc doesn't have support for the pragma of pedantic.

Signed-off-by: Raslan Darawsheh <rasland at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx4/Makefile | 5 ++++-
 drivers/net/mlx5/Makefile | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
index df20c83d5..21b507982 100644
--- a/drivers/net/mlx4/Makefile
+++ b/drivers/net/mlx4/Makefile
@@ -65,5 +65,8 @@ endif
 # User-defined CFLAGS.
 ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y)
-CFLAGS += -pedantic -UNDEBUG -DPEDANTIC
+CFLAGS += -pedantic -UNDEBUG
+ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
+CFLAGS += -DPEDANTIC
+endif
 AUTO_CONFIG_CFLAGS += -Wno-pedantic
 else
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 3b2f626d4..72a8c97d3 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -83,5 +83,8 @@ endif
 # User-defined CFLAGS.
 ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y)
-CFLAGS += -pedantic -UNDEBUG -DPEDANTIC
+CFLAGS += -pedantic -UNDEBUG
+ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
+CFLAGS += -DPEDANTIC
+endif
 AUTO_CONFIG_CFLAGS += -Wno-pedantic
 else
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:41.276993295 +0000
+++ 0032-net-mlx-fix-debug-build-with-icc.patch	2019-12-10 14:49:39.047457861 +0000
@@ -1 +1 @@
-From 38e118c0d8304190d4f24297fe2279a7b658c071 Mon Sep 17 00:00:00 2001
+From 5f113254fee556d16a6b93f286e4c9d507a96110 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 38e118c0d8304190d4f24297fe2279a7b658c071 ]
+
@@ -10,2 +11,0 @@
-Cc: stable at dpdk.org
-
@@ -20 +20 @@
-index 25d7c7555..7ea6f7489 100644
+index df20c83d5..21b507982 100644
@@ -23 +23 @@
-@@ -68,5 +68,8 @@ endif
+@@ -65,5 +65,8 @@ endif
@@ -34 +34 @@
-index 04de93a88..dae5b9fac 100644
+index 3b2f626d4..72a8c97d3 100644
@@ -37 +37 @@
-@@ -84,5 +84,8 @@ endif
+@@ -83,5 +83,8 @@ endif