From afb90502dae53b2a4dffd3b0125cf2eda20ce49d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 20:18:50 +0100 Subject: [PATCH] package/libgcrypt: fix Thumb mode workaround Fix the following build failure: /tmp/ccRqWxnA.s:98: Error: instruction not supported in Thumb16 mode -- `adds ip,fp,r0' Fixes: - http://autobuild.buildroot.org/results/4b96f4e41724e5c9c806a6c7df397a58d1ae1b1e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit cda8dabfeb8f53b1a7dd1341ad9fc7e37bff516e) Signed-off-by: Peter Korsgaard --- package/libgcrypt/libgcrypt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index e5fdfcfc8e..e8ffe00d73 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -26,8 +26,8 @@ LIBGCRYPT_CONF_OPTS += --disable-asm endif # Code doesn't build in thumb mode -ifeq ($(BR2_arm),y) -LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))" +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBGCRYPT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif $(eval $(autotools-package))