|
From: <sv...@va...> - 2010-10-20 21:13:16
|
Author: sewardj Date: 2010-10-20 22:13:08 +0100 (Wed, 20 Oct 2010) New Revision: 11465 Log: Merge from trunk, r11457 (be sure to pass -marm to all compilations of arm assembly files) Modified: branches/VALGRIND_3_6_BRANCH/Makefile.all.am Modified: branches/VALGRIND_3_6_BRANCH/Makefile.all.am =================================================================== --- branches/VALGRIND_3_6_BRANCH/Makefile.all.am 2010-10-20 21:11:20 UTC (rev 11464) +++ branches/VALGRIND_3_6_BRANCH/Makefile.all.am 2010-10-20 21:13:08 UTC (rev 11465) @@ -154,7 +154,7 @@ 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) |