summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2019-03-20 13:18:01 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-04-17 22:28:39 +0200
commit380154406dc8ce6f46a1c3e4e9fced5ba67644a1 (patch)
tree71f66da044d14a80e48c6ac16d45a34ea02a4a5e /config
parent821c51267bcd63a5310eb1a4293f5355defbe6f4 (diff)
downloaddpdk-draft-windows-380154406dc8ce6f46a1c3e4e9fced5ba67644a1.zip
dpdk-draft-windows-380154406dc8ce6f46a1c3e4e9fced5ba67644a1.tar.gz
dpdk-draft-windows-380154406dc8ce6f46a1c3e4e9fced5ba67644a1.tar.xz
build: use default flags for default Arm machine
When building for generic distribution we need a stable baseline architecture, or depending on the build worker the result will vary. Force the default flags if the user explicitly sets machine=default at configuration time. Fixes: b1d48c41189a ("build: support ARM with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi <bluca@debian.org> Acked-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
Diffstat (limited to 'config')
-rw-r--r--config/arm/meson.build6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 22a062b..431f03e 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -6,6 +6,7 @@
march_opt = '-march=@0@'.format(machine)
arm_force_native_march = false
+arm_force_default_march = (machine == 'default')
flags_common_default = [
# Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
@@ -120,7 +121,10 @@ else
cmd_generic = ['generic', '', '', 'default', '']
cmd_output = cmd_generic # Set generic by default
machine_args = [] # Clear previous machine args
- if not meson.is_cross_build()
+ if arm_force_default_march and not meson.is_cross_build()
+ machine = impl_generic
+ impl_pn = 'default'
+ elif not meson.is_cross_build()
# The script returns ['Implementer', 'Variant', 'Architecture',
# 'Primary Part number', 'Revision']
detect_vendor = find_program(join_paths(