From 62200879d49c085b120f37ce31d9123ebcc5895a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Jun 2023 19:17:08 +0200 Subject: [PATCH] package/libdeflate: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccGKQdKj.s: Assembler messages: /tmp/ccGKQdKj.s:199: Error: invalid constant (7) after fixup /tmp/ccGKQdKj.s:327: Error: invalid constant (0) after fixup /tmp/ccGKQdKj.s:338: Error: invalid constant (1) after fixup /tmp/ccGKQdKj.s:345: Error: invalid constant (20) after fixup /tmp/ccGKQdKj.s:354: Error: invalid constant (20) after fixup /tmp/ccGKQdKj.s:372: Error: invalid constant (20) after fixup /tmp/ccGKQdKj.s:528: Error: invalid constant (3f) after fixup /tmp/ccGKQdKj.s:531: Error: invalid constant (3f) after fixup /tmp/ccGKQdKj.s:202: Error: invalid constant (20000) after fixup /tmp/ccGKQdKj.s:482: Error: invalid constant (20000) after fixup /tmp/ccGKQdKj.s:549: Error: invalid constant (20000) after fixup Fixes: http://autobuild.buildroot.net/results/0103d64a4a6a9b0a708bfb77bf1714edc7acc714/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 67e97c6e5e..c09a033325 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -9,8 +9,17 @@ LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING LIBDEFLATE_INSTALL_STAGING = YES + +LIBDEFLATE_CFLAGS = -D_DEFAULT_SOURCE + +# Thumb build is broken, build in ARM mode, since all architectures +# that support Thumb1 also support ARM. +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBDEFLATE_CFLAGS += -marm +endif + LIBDEFLATE_CONF_OPTS = \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(LIBDEFLATE_CFLAGS)" ifeq ($(BR2_SHARED_LIBS),y) LIBDEFLATE_CONF_OPTS += \