[dpdk-stable] patch 'drivers/net: remove redundant icc flag' has been queued to stable release 18.02.2

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 18.02.2

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

Thanks.

Luca Boccassi

---
>From 06f34e6b087937425003d915aea9f008433c8a46 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Fri, 13 Apr 2018 23:21:09 +0100
Subject: [PATCH] drivers/net: remove redundant icc flag

[ upstream commit 91cf42f6c491ea707256d1778d89c4e852722b92 ]

ICC warning #188 already disabled globally via commit [1], no
need individual arguments in PMDs.

[1]
Fixes: 1b80b9c854c3 ("mk: disable icc warning 188")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Tested-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
 drivers/net/bnx2x/Makefile | 4 ----
 drivers/net/cxgbe/Makefile | 8 --------
 drivers/net/e1000/Makefile | 2 +-
 drivers/net/i40e/Makefile  | 2 +-
 drivers/net/qede/Makefile  | 1 -
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile
index e3a39a9e0..0c0f51aaa 100644
--- a/drivers/net/bnx2x/Makefile
+++ b/drivers/net/bnx2x/Makefile
@@ -17,10 +17,6 @@ EXPORT_MAP := rte_pmd_bnx2x_version.map
 
 LIBABIVER := 1
 
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -diag-disable 188 #188: enumerated type mixed with another type
-endif
-
 #
 # all source are stored in SRCS-y
 #
diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile
index 5dee3c723..33267f6a6 100644
--- a/drivers/net/cxgbe/Makefile
+++ b/drivers/net/cxgbe/Makefile
@@ -45,12 +45,6 @@ EXPORT_MAP := rte_pmd_cxgbe_version.map
 
 LIBABIVER := 1
 
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-#
-# CFLAGS for icc
-#
-CFLAGS_BASE_DRIVER = -diag-disable 188
-else
 #
 # CFLAGS for gcc/clang
 #
@@ -59,9 +53,7 @@ ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
 CFLAGS     += -Wno-deprecated
 endif
 endif
-CFLAGS_BASE_DRIVER =
 
-endif
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
 LDLIBS += -lrte_bus_pci
diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile
index 01941ac69..87cfb265d 100644
--- a/drivers/net/e1000/Makefile
+++ b/drivers/net/e1000/Makefile
@@ -22,7 +22,7 @@ ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
 #
 # CFLAGS for icc
 #
-CFLAGS_BASE_DRIVER  = -diag-disable 177 -diag-disable 181 -diag-disable 188
+CFLAGS_BASE_DRIVER  = -diag-disable 177 -diag-disable 181
 CFLAGS_BASE_DRIVER += -diag-disable 869 -diag-disable 2259
 else
 #
diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile
index c91545741..7e34b50a7 100644
--- a/drivers/net/i40e/Makefile
+++ b/drivers/net/i40e/Makefile
@@ -24,7 +24,7 @@ LIBABIVER := 2
 # to disable warnings
 #
 ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS_BASE_DRIVER = -diag-disable 593 -diag-disable 188
+CFLAGS_BASE_DRIVER = -diag-disable 593
 else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y)
 CFLAGS_BASE_DRIVER += -Wno-sign-compare
 CFLAGS_BASE_DRIVER += -Wno-unused-value
diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile
index db5ba966e..831ee15df 100644
--- a/drivers/net/qede/Makefile
+++ b/drivers/net/qede/Makefile
@@ -73,7 +73,6 @@ ifeq ($(shell clang -Wno-pointer-bool-conversion -Werror -E - < /dev/null > /dev
 CFLAGS_BASE_DRIVER += -Wno-pointer-bool-conversion
 endif
 else #ICC
-CFLAGS_BASE_DRIVER += -diag-disable 188   #188: enumerated type mixed with another type
 CFLAGS_qede_ethdev.o += -diag-disable 279 #279: controlling expression is constant
 endif
 
-- 
2.14.2