summaryrefslogtreecommitdiffstats
path: root/package/libglib2
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-11-30 08:19:59 +0100
committerPeter Korsgaard <peter@korsgaard.com>2015-11-30 08:19:59 +0100
commit26013972ce568e55a121c21a55afce45bc0675e9 (patch)
treea8c57f8c730fc43bcc59ec1be19fd7149eb10a1f /package/libglib2
parent9dbd2b55b9ff1b4e3e0a10916b62429c656c3d7f (diff)
downloadbuildroot-26013972ce568e55a121c21a55afce45bc0675e9.tar.gz
buildroot-26013972ce568e55a121c21a55afce45bc0675e9.zip
libglib2: force arm mode when building with thumb1
Fixes #8491 glib/valgrind.h contains inline asm not compatible with thumb1, so build it in arm mode: CC libglib_2_0_la-gstringchunk.lo /tmp/ccSVEXME.s: Assembler messages: /tmp/ccSVEXME.s:587: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#3' /tmp/ccSVEXME.s:587: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#13' /tmp/ccSVEXME.s:588: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#29' /tmp/ccSVEXME.s:588: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#19' /tmp/ccSVEXME.s:589: Error: lo register required -- `orr r10,r10,r10' Makefile:2087: recipe for target 'libglib_2_0_la-gslice.lo' failed Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libglib2')
-rw-r--r--package/libglib2/libglib2.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 8f6ca8361c..8cf055d586 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -85,6 +85,11 @@ else
LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes
endif
+# glib/valgrind.h contains inline asm not compatible with thumb1
+ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
+LIBGLIB2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm"
+endif
+
HOST_LIBGLIB2_CONF_OPTS = \
--disable-coverage \
--disable-dtrace \
OpenPOWER on IntegriCloud