From c8403d8045c7dc12e2436276253749717b5a035a Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 19 Nov 2018 13:00:32 +0000 Subject: [PATCH] Drop patches merged in 18.11-rc4 Change-Id: I3d5b1f53b20cfa8823dcbf81379a53e3ade4c049 Signed-off-by: Luca Boccassi --- ...ld-avoid-non-supported-march-on-ppc-meson.patch | 42 ------------- ...build-establish-an-invariant-machine-type.patch | 69 ---------------------- ...uild-set-mfpu-neon-flag-for-armv7a-builds.patch | 24 -------- debian/patches/series | 3 - 4 files changed, 138 deletions(-) delete mode 100644 debian/patches/0001-build-avoid-non-supported-march-on-ppc-meson.patch delete mode 100644 debian/patches/0002-build-establish-an-invariant-machine-type.patch delete mode 100644 debian/patches/0003-build-set-mfpu-neon-flag-for-armv7a-builds.patch diff --git a/debian/patches/0001-build-avoid-non-supported-march-on-ppc-meson.patch b/debian/patches/0001-build-avoid-non-supported-march-on-ppc-meson.patch deleted file mode 100644 index d6deca59..00000000 --- a/debian/patches/0001-build-avoid-non-supported-march-on-ppc-meson.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b43de46c21b7691c087e980f67814e4c59d2213c Mon Sep 17 00:00:00 2001 -From: Christian Ehrhardt -Date: Wed, 14 Nov 2018 12:12:45 +0100 -Subject: [PATCH 1/2] build: avoid non supported -march on ppc (meson) - -So far only if machine was "native" it did use the re-direction to -not set -march on ppc64 (where -march is not supported). -We have to use mcpu/mtune in any case on ppc for whatever someone using -the build system defines as machine. - -Fixes: 54d609a13876 ("build: add ppc64 meson build") - -Acked-by: Luca Boccassi -Signed-off-by: Christian Ehrhardt - -Forwarded: yes -Author: Christian Ehrhardt -Last-Update: 2018-11-15 - ---- - config/meson.build | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/config/meson.build b/config/meson.build -index 0b710b795..1af305f46 100644 ---- a/config/meson.build -+++ b/config/meson.build -@@ -9,8 +9,9 @@ else - endif - dpdk_conf.set('RTE_MACHINE', machine) - machine_args = [] --# ppc64 does not support -march=native --if host_machine.cpu_family().startswith('ppc') and machine == 'native' -+ -+# ppc64 does not support -march= at all, use -mcpu and -mtune for that -+if host_machine.cpu_family().startswith('ppc') - machine_args += '-mcpu=' + machine - machine_args += '-mtune=' + machine - else --- -2.17.1 - diff --git a/debian/patches/0002-build-establish-an-invariant-machine-type.patch b/debian/patches/0002-build-establish-an-invariant-machine-type.patch deleted file mode 100644 index 288f7044..00000000 --- a/debian/patches/0002-build-establish-an-invariant-machine-type.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e12f30d265ff63a8c9164546355f9ff42abafd50 Mon Sep 17 00:00:00 2001 -From: Christian Ehrhardt -Date: Wed, 14 Nov 2018 12:22:35 +0100 -Subject: [PATCH 2/2] build: establish an invariant machine type - -Add the machine definition 'default' which is special compared -to 'native' (most optimized for current system) or any explicit -type (external entity has to decide on the type). - -It defaults to the per arch agreed common minimal baseline -needed for DPDK to reasonable work. - -That might not be the most optimized, but the most portable -version while still being able to support the CPU features -required for DPDK. - -Going forward this can be bumped up by the DPDK project, but it -can never be an invariant like 'native'. - -Distributions and other needing portable code are expected to -define the machine as 'default'. - -Acked-by: Bruce Richardson -Acked-by: Luca Boccassi -Signed-off-by: Christian Ehrhardt - -Forwarded: yes -Author: Christian Ehrhardt -Last-Update: 2018-11-15 - ---- - config/meson.build | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/config/meson.build b/config/meson.build -index 1af305f46..db32499b3 100644 ---- a/config/meson.build -+++ b/config/meson.build -@@ -7,6 +7,27 @@ if meson.is_cross_build() - else - machine = get_option('machine') - endif -+ -+# machine type 'default' is special, it defaults to the per arch agreed common -+# minimal baseline needed for DPDK. -+# That might not be the most optimized, but the most portable version while -+# still being able to support the CPU features required for DPDK. -+# This can be bumped up by the DPDK project, but it can never be an -+# invariant like 'native' -+if machine == 'default' -+ if host_machine.cpu_family().startswith('x86') -+ # matches the old pre-meson build systems default -+ machine = 'corei7' -+ elif host_machine.cpu_family().startswith('arm') -+ machine = 'armv7-a' -+ elif host_machine.cpu_family().startswith('aarch') -+ # arm64 manages defaults in config/arm/meson.build -+ machine = 'default' -+ elif host_machine.cpu_family().startswith('ppc') -+ machine = 'power8' -+ endif -+endif -+ - dpdk_conf.set('RTE_MACHINE', machine) - machine_args = [] - --- -2.17.1 - diff --git a/debian/patches/0003-build-set-mfpu-neon-flag-for-armv7a-builds.patch b/debian/patches/0003-build-set-mfpu-neon-flag-for-armv7a-builds.patch deleted file mode 100644 index 2d8167a8..00000000 --- a/debian/patches/0003-build-set-mfpu-neon-flag-for-armv7a-builds.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: build: set -mfpu=neon flag for armv7a builds - Building on armv7a with meson currenctly fails: - - /usr/lib/gcc/arm-linux-gnueabihf/8/include/arm_neon.h:10369:1: error: - inlining failed in call to always_inline ‘vld1q_s32’: target - specific option mismatch - - Set -mfpu=neon on that architecture like the legacy makefiles do to fix - the issue. -Forwarded: yes -Author: Luca Boccassi -Last-Update: 2018-11-15 ---- a/config/arm/meson.build -+++ b/config/arm/meson.build -@@ -89,6 +89,9 @@ if cc.sizeof('void *') != 8 - dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64) - dpdk_conf.set('RTE_ARCH_ARM', 1) - dpdk_conf.set('RTE_ARCH_ARMv7', 1) -+ # the minimum architecture supported, armv7-a, needs the following, -+ # mk/machine/armv7a/rte.vars.mk sets it too -+ machine_args += '-mfpu=neon' - else - dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128) - dpdk_conf.set('RTE_ARCH_ARM64', 1) diff --git a/debian/patches/series b/debian/patches/series index e1efcb35..e69de29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +0,0 @@ -0001-build-avoid-non-supported-march-on-ppc-meson.patch -0002-build-establish-an-invariant-machine-type.patch -0003-build-set-mfpu-neon-flag-for-armv7a-builds.patch -- 2.16.6