From: Julian Seward <jseward@acm.org>
Date: Sun, 22 Aug 2010 11:51:26 +0000 (+0000)
Subject: Merge from branches/THUMB: build system fixes for Thumb
X-Git-Tag: svn/VALGRIND_3_6_0~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=509ffafab1bf059c7651894c1f3ac194abfa02f7;p=thirdparty%2Fvalgrind.git

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 ee44abf462..dc2c4d84e5 100644
--- 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 aa1888371b..c0805457ef 100644
--- 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" \