From f16d0b36f8168a4c8ec71af178be558008008b98 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 13 Apr 2018 23:21:08 +0100 Subject: [PATCH] drivers/net: fix icc deprecated parameter warning With icc (ICC) 18.0.1 20171018, -wd usage generates following warning: icc: command line remark #10010: option '-wd3656' is deprecated and will be removed in a future release. See '-help deprecated' "icc -help deprecated" output is: -wd use -diag-disable Based on above information "-wd" converted to "-diag-disable" Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Tested-by: Pablo de Lara --- drivers/net/bnx2x/Makefile | 2 +- drivers/net/cxgbe/Makefile | 2 +- drivers/net/e1000/Makefile | 3 ++- drivers/net/fm10k/Makefile | 3 ++- drivers/net/i40e/Makefile | 2 +- drivers/net/ixgbe/Makefile | 5 +++-- drivers/net/qede/Makefile | 4 ++-- drivers/net/sfc/Makefile | 2 +- drivers/net/sfc/meson.build | 2 +- drivers/net/vmxnet3/Makefile | 3 ++- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile index 90ff8b1eea..e3a39a9e03 100644 --- a/drivers/net/bnx2x/Makefile +++ b/drivers/net/bnx2x/Makefile @@ -18,7 +18,7 @@ EXPORT_MAP := rte_pmd_bnx2x_version.map LIBABIVER := 1 ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -wd188 #188: enumerated type mixed with another type +CFLAGS += -diag-disable 188 #188: enumerated type mixed with another type endif # diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile index 8fba1a5408..1015fec12c 100644 --- a/drivers/net/cxgbe/Makefile +++ b/drivers/net/cxgbe/Makefile @@ -22,7 +22,7 @@ ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # -CFLAGS_BASE_DRIVER = -wd188 +CFLAGS_BASE_DRIVER = -diag-disable 188 else # # CFLAGS for gcc/clang diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile index ba81a1f458..01941ac695 100644 --- a/drivers/net/e1000/Makefile +++ b/drivers/net/e1000/Makefile @@ -22,7 +22,8 @@ ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # -CFLAGS_BASE_DRIVER = -wd177 -wd181 -wd188 -wd869 -wd2259 +CFLAGS_BASE_DRIVER = -diag-disable 177 -diag-disable 181 -diag-disable 188 +CFLAGS_BASE_DRIVER += -diag-disable 869 -diag-disable 2259 else # # CFLAGS for gcc/clang diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile index b059a700a9..d657dff8a1 100644 --- a/drivers/net/fm10k/Makefile +++ b/drivers/net/fm10k/Makefile @@ -19,7 +19,8 @@ ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # -CFLAGS_BASE_DRIVER = -wd174 -wd593 -wd869 -wd981 -wd2259 +CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 +CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile index 5663f5b1c6..c915457414 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 = -wd593 -wd188 +CFLAGS_BASE_DRIVER = -diag-disable 593 -diag-disable 188 else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) CFLAGS_BASE_DRIVER += -Wno-sign-compare CFLAGS_BASE_DRIVER += -Wno-unused-value diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile index d0804fc5bc..f8cad125b3 100644 --- a/drivers/net/ixgbe/Makefile +++ b/drivers/net/ixgbe/Makefile @@ -20,9 +20,10 @@ ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # -CFLAGS_BASE_DRIVER = -wd174 -wd593 -wd869 -wd981 -wd2259 +CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 +CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 -CFLAGS_ixgbe_rxtx.o += -wd3656 +CFLAGS_ixgbe_rxtx.o += -diag-disable 3656 else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) # diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile index ccbffa45d2..db5ba966e5 100644 --- a/drivers/net/qede/Makefile +++ b/drivers/net/qede/Makefile @@ -73,8 +73,8 @@ 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 += -wd188 #188: enumerated type mixed with another type -CFLAGS_qede_ethdev.o += -wd279 #279: controlling expression is constant +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 # diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile index d3361d1399..f3e0b4b4ef 100644 --- a/drivers/net/sfc/Makefile +++ b/drivers/net/sfc/Makefile @@ -46,7 +46,7 @@ else ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable # Suppress ICC false positive warning on 'bulk' may be used before its # value is set -CFLAGS_sfc_ef10_tx.o += -wd3656 +CFLAGS_sfc_ef10_tx.o += -diag-disable 3656 endif LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build index b60a8f58d2..a37fc44a76 100644 --- a/drivers/net/sfc/meson.build +++ b/drivers/net/sfc/meson.build @@ -32,7 +32,7 @@ extra_flags += [ # Suppress ICC false positive warning on 'bulk' may be used before its # value is set -extra_flags += '-wd3656' +extra_flags += '-diag-disable 3656' foreach flag: extra_flags if cc.has_argument(flag) diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile index 6bfbf01958..9118501405 100644 --- a/drivers/net/vmxnet3/Makefile +++ b/drivers/net/vmxnet3/Makefile @@ -15,7 +15,8 @@ ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # -CFLAGS_BASE_DRIVER = -wd174 -wd593 -wd869 -wd981 -wd2259 +CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 +CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) # -- 2.20.1