mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

pulseaudio: check if NEON code can be compiled on arm

Browse Source 
Backport a patch to check if NEON code can be compiled on arm to
fix below issue:
 | /prj/tmp-glibc/work/armv5e-wrs-linux-gnueabi/pulseaudio/14.0-r0/recipe-sysroot-native/usr/lib/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/10.2.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI.  Please use -mfloat-abi=softfp or -mfloat-abi=hard"
 |  31 | #error "NEON intrinsics not available with the soft-float ABI.  Please use -mfloat-abi=softfp or -mfloat-abi=hard"
      |  ^~~~~
 | ../pulseaudio-14.0/src/pulsecore/mix_neon.c: In function 'pa_mix_ch2_s16ne_neon':
 | ../pulseaudio-14.0/src/pulsecore/mix_neon.c:38:9: error: unknown type name 'int32x4_t'; did you mean 'int32_t'?
 |   38 |         int32x4_t sum0, sum1;

(From OE-Core rev: 79dedfbae5edceecca2b0abfacb3c61abcab7cfa)

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Tested-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mingli Yu
2021-07-02 16:09:51 +08:00
committed by Richard Purdie
parent 6a9449f0c1
commit 692c2b3652
2 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch Normal file
View File

@@ -0,0 +1,71 @@
From 09f846fbdeb19193e778ce51baa77bd03c38372e Mon Sep 17 00:00:00 2001
From: garrison <garrison@qemu15.qemu-network>
Date: Fri, 4 Jun 2021 22:13:02 +0000
Subject: [PATCH] build-sys: meson: check if NEON code can be compiled on arm
When Meson SIMD module returns HAVE_NEON=1 on arm host, do extra compile check
to verify compiler can actually handle NEON code.
Related Meson issue #6361 https://github.com/mesonbuild/meson/issues/6361
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/574>
Upstream-Status: Backport[https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/6d2a49a6a1eacc2096d0d9473a074421c181ab56]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
src/pulsecore/meson.build | 41 +++++++++++++++++++++++++++++----------
1 file changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
index 99a702e..d0b7990 100644
--- a/src/pulsecore/meson.build
+++ b/src/pulsecore/meson.build
@@ -172,16 +172,37 @@ endif
# FIXME: SIMD support (ORC)
simd = import('unstable-simd')
-libpulsecore_simd = simd.check('libpulsecore_simd',
- mmx : ['remap_mmx.c', 'svolume_mmx.c'],
- sse : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'],
- neon : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'],
- c_args : [pa_c_args],
- include_directories : [configinc, topinc],
- implicit_include_directories : false,
- compiler : cc)
-libpulsecore_simd_lib = libpulsecore_simd[0]
-cdata.merge_from(libpulsecore_simd[1])
+simd_variants = [
+ { 'mmx' : ['remap_mmx.c', 'svolume_mmx.c'] },
+ { 'sse' : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'] },
+ { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] },
+]
+
+libpulsecore_simd_lib = []
+
+foreach simd_kwargs : simd_variants
+
+ if host_machine.cpu_family() == 'arm' and 'neon' in simd_kwargs
+ if not cc.compiles('''
+ #include <arm_neon.h>
+ int main() {
+ return sizeof(uint8x8_t) + sizeof(int32x4_t) + sizeof(float32x4_t);
+ }
+ ''', name : 'neon code')
+ continue
+ endif
+ endif
+
+ libpulsecore_simd = simd.check('libpulsecore_simd',
+ kwargs : simd_kwargs,
+ c_args : [pa_c_args],
+ include_directories : [configinc, topinc],
+ implicit_include_directories : false,
+ compiler : cc)
+
+ libpulsecore_simd_lib += libpulsecore_simd[0]
+ cdata.merge_from(libpulsecore_simd[1])
+endforeach
# FIXME: Implement Windows support
#'mutex-win32.c',

1
meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb
View File

@@ -7,6 +7,7 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
file://0001-meson-Check-for-__get_cpuid.patch \
file://volatiles.04_pulse \
file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \
file://0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch \
"
SRC_URI[md5sum] = "1efc916251910f1e9d4df7810e3e69f8"
SRC_URI[sha256sum] = "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1"