diff options
| -rw-r--r-- | patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch | 25 | ||||
| -rw-r--r-- | patches/meson-0.51.2/series | 3 |
2 files changed, 27 insertions, 1 deletions
diff --git a/patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch new file mode 100644 index 000000000..a479b4083 --- /dev/null +++ b/patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch @@ -0,0 +1,25 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 1 Oct 2019 22:30:59 +0200 +Subject: [PATCH] HACK: enable NEON only for ARMv7 + +NEON detection is broken, so just skip it for anything that is not ARMv7. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + mesonbuild/modules/unstable_simd.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py +index 2f2f67f79091..a329a4761d20 100644 +--- a/mesonbuild/modules/unstable_simd.py ++++ b/mesonbuild/modules/unstable_simd.py +@@ -62,6 +62,9 @@ class SimdModule(ExtensionModule): + continue + iset_fname = kwargs[iset] # Migth also be an array or Files. static_library will validate. + args = compiler.get_instruction_set_args(iset) ++ cpu = state.environment.machines.host.cpu ++ if iset == 'neon' and not cpu.startswith('armv7'): ++ args = None + if args is None: + mlog.log('Compiler supports %s:' % iset, mlog.red('NO')) + continue diff --git a/patches/meson-0.51.2/series b/patches/meson-0.51.2/series index 119016a64..e6ca14c3f 100644 --- a/patches/meson-0.51.2/series +++ b/patches/meson-0.51.2/series @@ -3,4 +3,5 @@ 0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch 0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch 0003-HACK-don-t-loose-the-rpath-for-host-packages.patch -# 5cb122e1f6a7d12f6e2fc7dd5a2d329b - git-ptx-patches magic +0004-HACK-enable-NEON-only-for-ARMv7.patch +# 3d7acfa5e27658c133f3d4f6976b1453 - git-ptx-patches magic |