diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-12-24 13:53:33 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-12-30 13:31:59 +0100 |
| commit | a9a4a00fca147fee174b8d908d0c34045d9f4f18 (patch) | |
| tree | 0ef747fc6e9d8c1a037f8890ef15e115d5cca305 | |
| parent | 443a57452220dba403739ef590bb92ff46d1a393 (diff) | |
Backport patch to fix arm64 baseline architecture
Change-Id: Icb4b29c24c20e740c10539569d9055942e37e386
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
| -rw-r--r-- | debian/patches/0002-build-use-generic-march-on-arm64-when-using-default.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/0002-build-use-generic-march-on-arm64-when-using-default.patch b/debian/patches/0002-build-use-generic-march-on-arm64-when-using-default.patch new file mode 100644 index 00000000..3f1b10d4 --- /dev/null +++ b/debian/patches/0002-build-use-generic-march-on-arm64-when-using-default.patch @@ -0,0 +1,31 @@ +Description: use generic march on arm64 when using 'default' 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 marchine=default + at configuration time. +Author: Luca Boccassi <bluca@debian.org> +Forwarded: https://patches.dpdk.org/patch/49259/ +--- 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' + + machine_args_generic = [ + ['default', ['-march=armv8-a+crc+crypto']], +@@ -102,7 +103,11 @@ 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 ++ cmd_output = cmd_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( diff --git a/debian/patches/series b/debian/patches/series index 65570207..a673de8c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-doc-fix-garbage-text-in-generated-HTML-guides.patch +0002-build-use-generic-march-on-arm64-when-using-default.patch |