[dpdk-dev] mk: fix compilation for icc version 16

Message ID 1448030073-30711-1-git-send-email-declan.doherty@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Doherty, Declan Nov. 20, 2015, 2:34 p.m. UTC
  This patch changes the ICC conditional check to disable
-no-inline-max-size and -no-inline-max-total-size to be
for all versions of icc greater than 14 and not just for version 15.

Signed-off-by: Declan Doherty <declan.doherty@intel.com>
---
 mk/toolchain/icc/rte.vars.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Olivier Matz Nov. 20, 2015, 3:34 p.m. UTC | #1
Hi,

On 11/20/2015 03:34 PM, Declan Doherty wrote:
> This patch changes the ICC conditional check to disable
> -no-inline-max-size and -no-inline-max-total-size to be
> for all versions of icc greater than 14 and not just for version 15.
> 
> Signed-off-by: Declan Doherty <declan.doherty@intel.com>
> ---
>  mk/toolchain/icc/rte.vars.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk
> index e39d710..9b6b34b 100644
> --- a/mk/toolchain/icc/rte.vars.mk
> +++ b/mk/toolchain/icc/rte.vars.mk
> @@ -74,8 +74,8 @@ WERROR_FLAGS += -diag-disable 13368 -diag-disable 15527
>  
>  # process cpu flags
>  include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk
> -# disable max-inline params boundaries for ICC 15 compiler
> -ifeq ($(shell test $(ICC_MAJOR_VERSION) -eq 15 && echo 1), 1)
> +# disable max-inline params boundaries for ICC compiler for version 15 and greater
> +ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 14 && echo 1), 1)
>  	TOOLCHAIN_CFLAGS += -no-inline-max-size -no-inline-max-total-size
>  endif
>  
> 

Acked-by: Olivier Matz <olivier.matz@6wind.com>
  
Thomas Monjalon Nov. 20, 2015, 4:08 p.m. UTC | #2
2015-11-20 16:34, Olivier MATZ:
> On 11/20/2015 03:34 PM, Declan Doherty wrote:
> > This patch changes the ICC conditional check to disable
> > -no-inline-max-size and -no-inline-max-total-size to be
> > for all versions of icc greater than 14 and not just for version 15.
> > 
> > Signed-off-by: Declan Doherty <declan.doherty@intel.com>
> 
> Acked-by: Olivier Matz <olivier.matz@6wind.com>

Applied, thanks
  

Patch

diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk
index e39d710..9b6b34b 100644
--- a/mk/toolchain/icc/rte.vars.mk
+++ b/mk/toolchain/icc/rte.vars.mk
@@ -74,8 +74,8 @@  WERROR_FLAGS += -diag-disable 13368 -diag-disable 15527
 
 # process cpu flags
 include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk
-# disable max-inline params boundaries for ICC 15 compiler
-ifeq ($(shell test $(ICC_MAJOR_VERSION) -eq 15 && echo 1), 1)
+# disable max-inline params boundaries for ICC compiler for version 15 and greater
+ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 14 && echo 1), 1)
 	TOOLCHAIN_CFLAGS += -no-inline-max-size -no-inline-max-total-size
 endif