From: Julian Seward Date: Wed, 20 Oct 2010 21:13:08 +0000 (+0000) Subject: Merge from trunk, r11457 (be sure to pass -marm to all compilations X-Git-Tag: svn/VALGRIND_3_6_0~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2edebdc4bbbf4ee9015eed0af0653f42dd077737;p=thirdparty%2Fvalgrind.git Merge from trunk, r11457 (be sure to pass -marm to all compilations of arm assembly files) git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_6_BRANCH@11465 --- diff --git a/Makefile.all.am b/Makefile.all.am index dc2c4d84e5..789e2a7653 100644 --- a/Makefile.all.am +++ b/Makefile.all.am @@ -154,7 +154,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) -marm -AM_CCASFLAGS_ARM_LINUX = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ -g +AM_CCASFLAGS_ARM_LINUX = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ -marm -g AM_FLAG_M3264_PPC32_AIX5 = @FLAG_MAIX32@ AM_CFLAGS_PPC32_AIX5 = @FLAG_MAIX32@ -mcpu=powerpc $(AM_CFLAGS_BASE)