# gatomic.c uses SWP, which doesn't work in Thumb mode.
# Put that source file into a separate convenience library which is always built as ARM.

---
 glib/Makefile.am |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- glib-2.20.3.orig/glib/Makefile.am
+++ glib-2.20.3/glib/Makefile.am
@@ -78,10 +78,11 @@ BUILT_EXTRA_DIST = 		\
 	glib.rc			\
 	galias.h		\
 	galiasdef.c
 
 lib_LTLIBRARIES = libglib-2.0.la
+noinst_LTLIBRARIES = libgatomic.la
 
 if OS_WIN32_AND_DLL_COMPILATION
 if MS_LIB_AVAILABLE
 noinst_DATA = glib-2.0.lib
 
@@ -94,14 +95,18 @@ install-ms-lib:
 	$(install_ms_lib_cmd)
 
 uninstall-ms-lib:
 	$(uninstall_ms_lib_cmd)
 
+libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb
+
+libgatomic_la_SOURCES =                \
+       gatomic.c
+
 libglib_2_0_la_SOURCES = 	\
 	garray.c		\
 	gasyncqueue.c		\
-	gatomic.c		\
 	gbacktrace.c		\
 	gbase64.c		\
 	gbookmarkfile.c 	\
 	gbsearcharray.h		\
 	gcache.c		\
@@ -286,12 +291,12 @@ endif
 else
 pcre_lib =
 pcre_inc =
 endif
 
-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)
-libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libgatomic.la
+libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libgatomic.la
 
 libglib_2_0_la_LDFLAGS = \
 	 $(glib_win32_res_ldflag) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-dynamic $(no_undefined) $(export_symbols)