From c8cc28b5ced34677a39de8e7bcc9a96d6e8df9fe Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 5 Jul 2023 18:20:11 +0200 Subject: [PATCH] package/ffmpeg: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccw5V2Ti.s: Assembler messages: /tmp/ccw5V2Ti.s:2013: Error: selected processor does not support `itt gt' in Thumb mode /tmp/ccw5V2Ti.s:2014: Error: Thumb does not support conditional execution /tmp/ccw5V2Ti.s:2015: Error: Thumb does not support conditional execution /tmp/ccw5V2Ti.s:2017: Error: selected processor does not support `it le' in Thumb mode /tmp/ccw5V2Ti.s:2018: Error: Thumb does not support conditional execution /tmp/ccw5V2Ti.s:2020: Error: selected processor does not support `it gt' in Thumb mode /tmp/ccw5V2Ti.s:2021: Error: Thumb does not support conditional execution Fixes: http://autobuild.buildroot.net/results/3fc/3fc68f756cf1661673941c411c4a2477e901e361/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 9d9209706a..ce285bcc60 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -554,6 +554,10 @@ FFMPEG_CONF_OPTS += --disable-optimizations FFMPEG_CFLAGS += -O0 endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FFMPEG_CFLAGS += -marm +endif + FFMPEG_CONF_ENV += CFLAGS="$(FFMPEG_CFLAGS)" FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))