[Buildroot] [PATCH 1/1] package/libdeflate: force arm mode instead of Thumb mode

* [Buildroot] [PATCH 1/1] package/libdeflate: force arm mode instead of Thumb mode
@ 2023-06-07 17:17 Bernd Kuhls
  2023-06-07 20:21 ` Peter Korsgaard
  2023-06-14 14:53 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Bernd Kuhls @ 2023-06-07 17:17 UTC (permalink / raw)
  To: buildroot

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 <bernd.kuhls@t-online.de>
---
 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 += \
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread