From e51bb2ced96c8826dcdce7ea46338d63a1ada2bf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 26 Jan 2024 18:32:15 +0100 Subject: [PATCH] package/faad2: force arm mode instead of Thumb mode Fix the following build failure in Thumb mode: /tmp/ccfzn6FH.s:36: Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/838808b4751244ee01cde6b8261212b49e511a32 Signed-off-by: Fabrice Fontaine [Peter: reword comment slightly] Signed-off-by: Peter Korsgaard (cherry picked from commit a33827760823b1455326e0fc8cf6089a3081e782) Signed-off-by: Peter Korsgaard --- package/faad2/faad2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index 686e5045c0..0b249b3450 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -12,4 +12,11 @@ FAAD2_CPE_ID_VENDOR = audiocoding FAAD2_CPE_ID_PRODUCT = freeware_advanced_audio_decoder_2 FAAD2_INSTALL_STAGING = YES +# faad2 contains assembly routines using ARM instructions not present in thumb1 mode: +# Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode +# so force ARM mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FAAD2_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -marm" +endif + $(eval $(cmake-package))