Merge from branches/THUMB: build system fixes for Thumb

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11276

diff --git a/Makefile.all.am b/Makefile.all.am
index ee44abf462001344854f3eae8a6949a6a2a2193a..dc2c4d84e509e914efea8e3d106e70890378c838 100644 (file)
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -153,7 +153,7 @@ AM_CCASFLAGS_PPC64_LINUX  = $(AM_CPPFLAGS_PPC64_LINUX) @FLAG_M64@ -g
 
 AM_FLAG_M3264_ARM_LINUX   = @FLAG_M32@
 AM_CFLAGS_ARM_LINUX       = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \
-                               $(AM_CFLAGS_BASE)
+                               $(AM_CFLAGS_BASE) -marm
 AM_CCASFLAGS_ARM_LINUX    = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ -g
 
 AM_FLAG_M3264_PPC32_AIX5  = @FLAG_MAIX32@

diff --git a/Makefile.vex.am b/Makefile.vex.am
index aa1888371b505eac4a138cc8b3c8693d789f086a..c0805457ef3369dfb7f130c5c52ae545c90c56b8 100644 (file)
--- a/Makefile.vex.am
+++ b/Makefile.vex.am
@@ -54,8 +54,10 @@ CLEANFILES    = pub/libvex_guest_offsets.h
 # differently -- with a leading $ on x86/amd64 but none on ppc32/64.
 pub/libvex_guest_offsets.h:
        rm -f auxprogs/genoffsets.s
-       $(CC) $(LIBVEX_CFLAGS) -O -S -o auxprogs/genoffsets.s \
-                                       auxprogs/genoffsets.c
+       $(CC) $(LIBVEX_CFLAGS) \
+             $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \
+                               -O -S -o auxprogs/genoffsets.s \
+                                        auxprogs/genoffsets.c
        grep xyzzy auxprogs/genoffsets.s | grep define \
           | sed "s/xyzzy\\$$//g" \
           | sed "s/xyzzy#//g" \