-From e12f30d265ff63a8c9164546355f9ff42abafd50 Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-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 <bruce.richardson@intel.com>
-Acked-by: Luca Boccassi <bluca@debian.org>
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-
-Forwarded: yes
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-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
-