diff options
author | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-04-24 07:12:39 +0000 |
---|---|---|
committer | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-04-24 07:12:39 +0000 |
commit | 52cb75c8055bf17e79c560d2c46471850aa3fcc5 (patch) | |
tree | d83cbc0dd20cee9ae1f4bcc3fe5bc6633fdc5f3f /cachegrind | |
parent | 9c533254da4205e624f90288a0df734d64cc3b88 (diff) |
Merged r9602 and r9603 (make cpuid pass on Darwin, rename .s files to .S)
from the DARWIN branch.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9604 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'cachegrind')
-rw-r--r-- | cachegrind/tests/x86/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cachegrind/tests/x86/Makefile.am b/cachegrind/tests/x86/Makefile.am index 8c8e7e24..db9a8758 100644 --- a/cachegrind/tests/x86/Makefile.am +++ b/cachegrind/tests/x86/Makefile.am @@ -12,6 +12,6 @@ check_PROGRAMS = \ AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CCASFLAGS = @FLAG_M32@ +AM_CCASFLAGS = $(AM_CPPFLAGS) @FLAG_M32@ fpu_28_108_SOURCES = fpu-28-108.S |