From 620bd7220a6e30eb8bdcc346a4584783d45953e1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Jan 2024 22:14:20 +0100 Subject: [PATCH] package/liquid-dsp: fix x86 builds HAVE_{MMX,SSE2,...} are not defined if ax_cv_have_{i}_cpu_ext is not set resulting in the following build failure raised since bump to version 1.5.0 in commit c2aaa0fbe2fdf6e599c68169aa7b2e55237190c7 and https://github.com/jgaeddert/liquid-dsp/commit/02c4e8b99b11d9f1615b8840f243b08a85b86563: src/dotprod/src/dotprod_cccf.sse.c: In function 'dotprod_cccf_execute_sse': src/dotprod/src/dotprod_cccf.sse.c:258:5: error: unknown type name '__m128'; did you mean '__int128'? 258 | __m128 v; // input vector | ^~~~~~ | __int128 or src/dotprod/src/dotprod_cccf.mmx.c: In function 'dotprod_cccf_execute_mmx': src/dotprod/src/dotprod_cccf.mmx.c:262:5: error: unknown type name '__m128'; did you mean '__int128'? 262 | __m128 v; // input vector | ^~~~~~ | __int128 While at it, add AVX2 support Fixes: - http://autobuild.buildroot.org/results/738ce9d3dc74ec165391f21256c955e5524f1632 - http://autobuild.buildroot.org/results/a2d150c724ab6787aeabaf31f65116f802e8584e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/liquid-dsp/liquid-dsp.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index eb4cda67a5..ce4cd5a7a7 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -13,13 +13,23 @@ LIQUID_DSP_AUTORECONF = YES LIQUID_DSP_CONF_ENV = \ ax_cv_have_mmx_ext=$(if $(BR2_X86_CPU_HAS_MMX),yes,no) \ + ax_cv_have_mmx_cpu_ext=$(if $(BR2_X86_CPU_HAS_MMX),yes,no) \ ax_cv_have_sse_ext=$(if $(BR2_X86_CPU_HAS_SSE),yes,no) \ + ax_cv_have_sse_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE),yes,no) \ ax_cv_have_sse2_ext=$(if $(BR2_X86_CPU_HAS_SSE2),yes,no) \ + ax_cv_have_sse2_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE2),yes,no) \ ax_cv_have_sse3_ext=$(if $(BR2_X86_CPU_HAS_SSE3),yes,no) \ + ax_cv_have_sse3_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE3),yes,no) \ ax_cv_have_ssse3_ext=$(if $(BR2_X86_CPU_HAS_SSSE3),yes,no) \ + ax_cv_have_ssse3_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSSE3),yes,no) \ ax_cv_have_sse41_ext=$(if $(BR2_X86_CPU_HAS_SSE4),yes,no) \ + ax_cv_have_sse41_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE4),yes,no) \ ax_cv_have_sse42_ext=$(if $(BR2_X86_CPU_HAS_SSE42),yes,no) \ - ax_cv_have_avx_ext=$(if $(BR2_X86_CPU_HAS_AVX),yes,no) + ax_cv_have_sse42_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE42),yes,no) \ + ax_cv_have_avx_ext=$(if $(BR2_X86_CPU_HAS_AVX),yes,no) \ + ax_cv_have_avx_cpu_ext=$(if $(BR2_X86_CPU_HAS_AVX),yes,no) \ + ax_cv_have_avx2_ext=$(if $(BR2_X86_CPU_HAS_AVX2),yes,no) \ + ax_cv_have_avx2_cpu_ext=$(if $(BR2_X86_CPU_HAS_AVX2),yes,no) LIQUID_DSP_CFLAGS = $(TARGET_CFLAGS) LIQUID_DSP_LDFLAGS = $(TARGET_LDFLAGS)