From 4de35ac07e2c4e28269cc2ec1e8b3acb9146747c Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 10 May 2016 12:23:27 +0100 Subject: [PATCH] qede: fix build with icc fix errors: icc: command line warning #10006: ignoring unknown option '-Wno-unused-value' icc: command line warning #10006: ignoring unknown option '-Wno-format-nonliteral' icc: command line warning #10006: ignoring unknown option '-Wno-shift-negative-value' qede/base/ecore_dev.c(1643): error #188: enumerated type mixed with another type return 0; ^ Fixes: ec94dbc57362 ("qede: add base driver") Signed-off-by: Ferruh Yigit Acked-by: Harish Patil --- drivers/net/qede/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile index 47e01be48a..d0c1361167 100644 --- a/drivers/net/qede/Makefile +++ b/drivers/net/qede/Makefile @@ -27,7 +27,6 @@ OS_TYPE := $(shell uname -s) # CFLAGS # CFLAGS_BASE_DRIVER = -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-value CFLAGS_BASE_DRIVER += -Wno-sign-compare CFLAGS_BASE_DRIVER += -Wno-missing-prototypes CFLAGS_BASE_DRIVER += -Wno-cast-qual @@ -35,12 +34,16 @@ CFLAGS_BASE_DRIVER += -Wno-unused-function CFLAGS_BASE_DRIVER += -Wno-unused-variable CFLAGS_BASE_DRIVER += -Wno-strict-aliasing CFLAGS_BASE_DRIVER += -Wno-missing-prototypes + +ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) +CFLAGS_BASE_DRIVER += -Wno-unused-value CFLAGS_BASE_DRIVER += -Wno-format-nonliteral ifeq ($(OS_TYPE),Linux) ifeq ($(shell clang -Wno-shift-negative-value -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0) CFLAGS_BASE_DRIVER += -Wno-shift-negative-value endif endif +endif ifneq (,$(filter gcc gcc48,$(CC))) CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable @@ -57,7 +60,7 @@ ifeq ($(shell clang -Wno-pointer-bool-conversion -Werror -E - < /dev/null > /dev CFLAGS_BASE_DRIVER += -Wno-pointer-bool-conversion endif else -#icc flags +CFLAGS_BASE_DRIVER += -wd188 #188: enumerated type mixed with another type endif # -- 2.20.1