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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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/21/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.

Thanks.

Luca Boccassi

---
>From 5aa7b1b186e4fab11edc259052e57e95826f7427 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 e0a8aaceca..0bde672958 100644
--- a/drivers/net/mlx4/Makefile
+++ b/drivers/net/mlx4/Makefile
@@ -73,7 +73,10 @@ 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
 CFLAGS += -DNDEBUG -UPEDANTIC
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index ed720b6a70..e6fe1c60ae 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -83,7 +83,10 @@ 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
 CFLAGS += -DNDEBUG -UPEDANTIC
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:29.815184915 +0000
+++ 0087-net-mlx-fix-debug-build-with-icc.patch	2019-12-19 14:32:26.209299888 +0000
@@ -1,14 +1,14 @@
-From 38e118c0d8304190d4f24297fe2279a7b658c071 Mon Sep 17 00:00:00 2001
+From 5aa7b1b186e4fab11edc259052e57e95826f7427 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.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Raslan Darawsheh <rasland at mellanox.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
 ---
@@ -17,10 +17,10 @@
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
-index 25d7c7555d..7ea6f74895 100644
+index e0a8aaceca..0bde672958 100644
 --- a/drivers/net/mlx4/Makefile
 +++ b/drivers/net/mlx4/Makefile
-@@ -67,7 +67,10 @@ endif
+@@ -73,7 +73,10 @@ endif
  
  # User-defined CFLAGS.
  ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y)
@@ -33,7 +33,7 @@
  else
  CFLAGS += -DNDEBUG -UPEDANTIC
 diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
-index 04de93a881..dae5b9fac1 100644
+index ed720b6a70..e6fe1c60ae 100644
 --- a/drivers/net/mlx5/Makefile
 +++ b/drivers/net/mlx5/Makefile
 @@ -83,7 +83,10 @@ endif