From f239aed5e674965691846e8ce3f187dd47523689 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 16 Aug 2017 18:42:05 +0100 Subject: New upstream version 17.08 Change-Id: I288b50990f52646089d6b1f3aaa6ba2f091a51d7 Signed-off-by: Luca Boccassi --- mk/machine/armv8a/rte.vars.mk | 6 +++--- mk/machine/atm/rte.vars.mk | 16 ++++++++-------- mk/machine/default/rte.vars.mk | 18 +++++++++--------- mk/machine/dpaa2/rte.vars.mk | 4 ++-- mk/machine/hsw/rte.vars.mk | 16 ++++++++-------- mk/machine/ivb/rte.vars.mk | 16 ++++++++-------- mk/machine/native/rte.vars.mk | 19 ++++++++----------- mk/machine/nhm/rte.vars.mk | 16 ++++++++-------- mk/machine/snb/rte.vars.mk | 16 ++++++++-------- mk/machine/thunderx/rte.vars.mk | 6 +++--- mk/machine/wsm/rte.vars.mk | 16 ++++++++-------- mk/machine/xgene1/rte.vars.mk | 4 ++-- 12 files changed, 75 insertions(+), 78 deletions(-) (limited to 'mk/machine') diff --git a/mk/machine/armv8a/rte.vars.mk b/mk/machine/armv8a/rte.vars.mk index d5049e1f..500421a2 100644 --- a/mk/machine/armv8a/rte.vars.mk +++ b/mk/machine/armv8a/rte.vars.mk @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright (C) Cavium networks 2015. All rights reserved. +# Copyright (C) Cavium, Inc 2015. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# * Neither the name of Cavium networks nor the names of its +# * Neither the name of Cavium, Inc nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. # @@ -55,4 +55,4 @@ # CPU_LDFLAGS = # CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc +MACHINE_CFLAGS += -march=armv8-a+crc+crypto diff --git a/mk/machine/atm/rte.vars.mk b/mk/machine/atm/rte.vars.mk index d6fbba0f..cfed1108 100644 --- a/mk/machine/atm/rte.vars.mk +++ b/mk/machine/atm/rte.vars.mk @@ -32,16 +32,16 @@ # # machine: # -# - can define ARCH variable (overriden by cmdline value) -# - can define CROSS variable (overriden by cmdline value) -# - define MACHINE_CFLAGS variable (overriden by cmdline value) -# - define MACHINE_LDFLAGS variable (overriden by cmdline value) -# - define MACHINE_ASFLAGS variable (overriden by cmdline value) -# - can define CPU_CFLAGS variable (overriden by cmdline value) that +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overriden by cmdline value) that +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overriden by cmdline value) that +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. # - may override any previously defined variable # diff --git a/mk/machine/default/rte.vars.mk b/mk/machine/default/rte.vars.mk index 53c6af6e..71a25bca 100644 --- a/mk/machine/default/rte.vars.mk +++ b/mk/machine/default/rte.vars.mk @@ -32,16 +32,16 @@ # # machine: # -# - can define ARCH variable (overriden by cmdline value) -# - can define CROSS variable (overriden by cmdline value) -# - define MACHINE_CFLAGS variable (overriden by cmdline value) -# - define MACHINE_LDFLAGS variable (overriden by cmdline value) -# - define MACHINE_ASFLAGS variable (overriden by cmdline value) -# - can define CPU_CFLAGS variable (overriden by cmdline value) that +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overriden by cmdline value) that +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overriden by cmdline value) that +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. # - may override any previously defined variable # @@ -55,4 +55,4 @@ # CPU_LDFLAGS = # CPU_ASFLAGS = -MACHINE_CFLAGS += -march=core2 +MACHINE_CFLAGS += -march=corei7 diff --git a/mk/machine/dpaa2/rte.vars.mk b/mk/machine/dpaa2/rte.vars.mk index a60819f3..4988f7c8 100644 --- a/mk/machine/dpaa2/rte.vars.mk +++ b/mk/machine/dpaa2/rte.vars.mk @@ -1,7 +1,7 @@ # BSD LICENSE # # Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright (c) 2016 NXP. All rights reserved. +# Copyright 2016 NXP. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -57,5 +57,5 @@ MACHINE_CFLAGS += -march=armv8-a+crc ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mcpu=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) +MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) endif diff --git a/mk/machine/hsw/rte.vars.mk b/mk/machine/hsw/rte.vars.mk index eedc5d02..66a562e7 100644 --- a/mk/machine/hsw/rte.vars.mk +++ b/mk/machine/hsw/rte.vars.mk @@ -32,16 +32,16 @@ # # machine: # -# - can define ARCH variable (overriden by cmdline value) -# - can define CROSS variable (overriden by cmdline value) -# - define MACHINE_CFLAGS variable (overriden by cmdline value) -# - define MACHINE_LDFLAGS variable (overriden by cmdline value) -# - define MACHINE_ASFLAGS variable (overriden by cmdline value) -# - can define CPU_CFLAGS variable (overriden by cmdline value) that +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overriden by cmdline value) that +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overriden by cmdline value) that +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. # - may override any previously defined variable # diff --git a/mk/machine/ivb/rte.vars.mk b/mk/machine/ivb/rte.vars.mk index 932241af..768a25d2 100644 --- a/mk/machine/ivb/rte.vars.mk +++ b/mk/machine/ivb/rte.vars.mk @@ -32,16 +32,16 @@ # # machine: # -# - can define ARCH variable (overriden by cmdline value) -# - can define CROSS variable (overriden by cmdline value) -# - define MACHINE_CFLAGS variable (overriden by cmdline value) -# - define MACHINE_LDFLAGS variable (overriden by cmdline value) -# - define MACHINE_ASFLAGS variable (overriden by cmdline value) -# - can define CPU_CFLAGS variable (overriden by cmdline value) that +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overriden by cmdline value) that +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overriden by cmdline value) that +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. # - may override any previously defined variable # diff --git a/mk/machine/native/rte.vars.mk b/mk/machine/native/rte.vars.mk index 6ce0c723..f7d98d0d 100644 --- a/mk/machine/native/rte.vars.mk +++ b/mk/machine/native/rte.vars.mk @@ -32,16 +32,16 @@ # # machine: # -# - can define ARCH variable (overriden by cmdline value) -# - can define CROSS variable (overriden by cmdline value) -# - define MACHINE_CFLAGS variable (overriden by cmdline value) -# - define MACHINE_LDFLAGS variable (overriden by cmdline value) -# - define MACHINE_ASFLAGS variable (overriden by cmdline value) -# - can define CPU_CFLAGS variable (overriden by cmdline value) that +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overriden by cmdline value) that +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overriden by cmdline value) that +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. # - may override any previously defined variable # @@ -63,8 +63,5 @@ MACHINE_CFLAGS = -march=native # so, set the compilation target to be a corei7, minimum target with SSE4.2. SSE42_SUPPORT=$(shell $(CC) -march=native -dM -E - /dev/null) - ifneq ($(CPU_SSE42_SUPPORT),) MACHINE_CFLAGS = -march=corei7 - endif endif diff --git a/mk/machine/nhm/rte.vars.mk b/mk/machine/nhm/rte.vars.mk index 9566efd7..8921c328 100644 --- a/mk/machine/nhm/rte.vars.mk +++ b/mk/machine/nhm/rte.vars.mk @@ -32,16 +32,16 @@ # # machine: # -# - can define ARCH variable (overriden by cmdline value) -# - can define CROSS variable (overriden by cmdline value) -# - define MACHINE_CFLAGS variable (overriden by cmdline value) -# - define MACHINE_LDFLAGS variable (overriden by cmdline value) -# - define MACHINE_ASFLAGS variable (overriden by cmdline value) -# - can define CPU_CFLAGS variable (overriden by cmdline value) that +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overriden by cmdline value) that +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overriden by cmdline value) that +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. # - may override any previously defined variable # diff --git a/mk/machine/snb/rte.vars.mk b/mk/machine/snb/rte.vars.mk index a9c1b7ca..0709f3d2 100644 --- a/mk/machine/snb/rte.vars.mk +++ b/mk/machine/snb/rte.vars.mk @@ -32,16 +32,16 @@ # # machine: # -# - can define ARCH variable (overriden by cmdline value) -# - can define CROSS variable (overriden by cmdline value) -# - define MACHINE_CFLAGS variable (overriden by cmdline value) -# - define MACHINE_LDFLAGS variable (overriden by cmdline value) -# - define MACHINE_ASFLAGS variable (overriden by cmdline value) -# - can define CPU_CFLAGS variable (overriden by cmdline value) that +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overriden by cmdline value) that +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overriden by cmdline value) that +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. # - may override any previously defined variable # diff --git a/mk/machine/thunderx/rte.vars.mk b/mk/machine/thunderx/rte.vars.mk index ad5a379b..cae6e3e1 100644 --- a/mk/machine/thunderx/rte.vars.mk +++ b/mk/machine/thunderx/rte.vars.mk @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright (C) Cavium networks 2015. All rights reserved. +# Copyright (C) Cavium, Inc 2015. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# * Neither the name of Cavium networks nor the names of its +# * Neither the name of Cavium, Inc nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. # @@ -55,4 +55,4 @@ # CPU_LDFLAGS = # CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc -mcpu=thunderx +MACHINE_CFLAGS += -march=armv8-a+crc+crypto -mcpu=thunderx diff --git a/mk/machine/wsm/rte.vars.mk b/mk/machine/wsm/rte.vars.mk index c8a266ca..3a2fa2b0 100644 --- a/mk/machine/wsm/rte.vars.mk +++ b/mk/machine/wsm/rte.vars.mk @@ -32,16 +32,16 @@ # # machine: # -# - can define ARCH variable (overriden by cmdline value) -# - can define CROSS variable (overriden by cmdline value) -# - define MACHINE_CFLAGS variable (overriden by cmdline value) -# - define MACHINE_LDFLAGS variable (overriden by cmdline value) -# - define MACHINE_ASFLAGS variable (overriden by cmdline value) -# - can define CPU_CFLAGS variable (overriden by cmdline value) that +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overriden by cmdline value) that +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overriden by cmdline value) that +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. # - may override any previously defined variable # diff --git a/mk/machine/xgene1/rte.vars.mk b/mk/machine/xgene1/rte.vars.mk index 419c2343..07f7994e 100644 --- a/mk/machine/xgene1/rte.vars.mk +++ b/mk/machine/xgene1/rte.vars.mk @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright (C) Cavium networks 2015. All rights reserved. +# Copyright (C) Cavium, Inc 2015. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# * Neither the name of Cavium networks nor the names of its +# * Neither the name of Cavium, Inc nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. # -- cgit 1.2.3-korg