Merge branch 'next'

[coffee/buildroot.git] / package / libglib2 / libglib2.mk

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index c3c9cf8301c8e6efdb860bcfa4c923e491bd4273..881c5cedf6ec00d14819fed8e7a2e0dc3395b305 100644 (file)
--- 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 \